diff --git a/changelog_latest.md b/changelog_latest.md index 3413a6e1..7ca28343 100644 --- a/changelog_latest.md +++ b/changelog_latest.md @@ -1,2 +1 @@ -1. Fix install: timeout for install Docker -2. Fix install: export apt lock check +1. Fix install error: cockpit port replace diff --git a/install/install_cockpit.sh b/install/install_cockpit.sh index c008529a..dd44519b 100644 --- a/install/install_cockpit.sh +++ b/install/install_cockpit.sh @@ -30,6 +30,7 @@ export PATH # $cockpit_port # $install_path ############################################################ +echo -e "\n\n-------- Cockpit --------" echo "cockpit_port:$cockpit_port" echo "install_path:$install_path" @@ -192,8 +193,7 @@ Set_Cockpit(){ fi echo "Change cockpit default port to $cockpit_port ..." - sudo sed -i "s/ListenStream=9090/ListenStream=$cockpit_port/" /lib/systemd/system/cockpit.socket - + sudo sed -i "s/ListenStream=[0-9]*/ListenStream=${cockpit_port}/" /lib/systemd/system/cockpit.socket # fwupd-refresh.service may push error for Cockpit menu, so disable it if sudo systemctl is-active --quiet fwupd-refresh.service; then diff --git a/install/install_docker.sh b/install/install_docker.sh index f0cae6a5..30661733 100644 --- a/install/install_docker.sh +++ b/install/install_docker.sh @@ -115,6 +115,6 @@ else fi } - +echo -e "\n\n-------- Docker --------" Upgrade_Docker Start_Docker \ No newline at end of file diff --git a/install/install_plugins.sh b/install/install_plugins.sh index 3640d46b..eb063866 100644 --- a/install/install_plugins.sh +++ b/install/install_plugins.sh @@ -39,8 +39,7 @@ if [ -z "$install_path" ]; then install_path="/data/websoft9/source" fi -echo "$echo_prefix_plugins Starting dowload plugin and update it" - +echo -e "\n\n-------- Plugins --------" echo "Your installation parameters are as follows: " echo "--channel: $channel" echo "--install_path: $install_path" @@ -53,6 +52,8 @@ versions_url="$source_github_pages/version.json" file_suffix=".zip" plugin_path="/usr/share/cockpit" +echo "$echo_prefix_plugins Starting download plugin and update it" + python3 - << END import requests import json diff --git a/version.json b/version.json index ad4080a1..6e5c7b42 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "0.8.26-rc6", + "version": "0.8.26-rc7", "plugins": { "portainer": "0.0.6", "nginx": "0.0.5",