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

This commit is contained in:
qiaofeng1227 2023-10-10 08:27:50 +08:00
commit 7977d1234b
3 changed files with 4 additions and 2 deletions

View File

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

View File

@ -171,10 +171,12 @@ Set_Firewall(){
echo "Set firewall for Cockpit..." echo "Set firewall for Cockpit..."
if ! systemctl is-active --quiet firewalld; then if ! systemctl is-active --quiet firewalld; then
sudo systemctl start firewalld 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 --permanent --zone=public --add-service=cockpit
sudo firewall-cmd --reload sudo firewall-cmd --reload
sudo systemctl stop firewalld sudo systemctl stop firewalld
else 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 --permanent --zone=public --add-service=cockpit
sudo firewall-cmd --reload sudo firewall-cmd --reload
fi fi

View File

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