Merge branch 'main' of https://github.com/Websoft9/websoft9 into main

changelog_latest.md

@@ -1 +1 @@
-1. Fix install error: Cockpit port
+1. Fix install error: Firewalld for cockpit

install/install_cockpit.sh

@@ -171,10 +171,12 @@ Set_Firewall(){
      echo "Set firewall for Cockpit..."
      if ! systemctl is-active --quiet firewalld; then
         sudo systemctl start firewalld
+        sudo sed -i "s/port=\"[0-9]*\"/port=\"$cockpit_port\"/g" /etc/firewalld/services/cockpit.xml
         sudo firewall-cmd --permanent --zone=public --add-service=cockpit
         sudo firewall-cmd --reload
         sudo systemctl stop firewalld
      else
+        sudo sed -i "s/port=\"[0-9]*\"/port=\"$cockpit_port\"/g" /etc/firewalld/services/cockpit.xml
         sudo firewall-cmd --permanent --zone=public --add-service=cockpit
         sudo firewall-cmd --reload
      fi

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.26-rc20",
+  "version": "0.8.26-rc21",
   "plugins": {
     "portainer": "0.0.6",
     "nginx": "0.0.5",