From 5c54f80efc25698f1d9ba79194703a0f968bab93 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 22 Aug 2019 14:46:39 +0200 Subject: [PATCH 1/5] Additional message after update --- install | 12 +++++++++--- wo/cli/plugins/stack_upgrade.py | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/install b/install index 870a0ff..756ef37 100755 --- a/install +++ b/install @@ -881,13 +881,19 @@ else echo elif [ "$wo_upgrade" = "1" ]; then wo_lib_echo "WordOps (wo) upgrade to $wo_version_new was succesfull!" + echo + wo_lib_echo "To upgrade Nginx use the command:" + wo_lib_echo_info "wo stack upgrade --nginx" + echo + wo_lib_echo "To update other packages use the command:" + wo_lib_echo_info "wo stack maintenance" else wo_lib_echo "WordOps (wo) installed successfully" + echo + wo_lib_echo "For autocompletion, run the following command:" + wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc" fi echo - wo_lib_echo_info "For autocompletion, run the following command:" - wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc" - echo wo_lib_echo "WordOps Documentation : https://docs.wordops.net" wo_lib_echo "WordOps Community Forum : https://community.wordops.net" echo diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index 584215b..f043144 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -12,7 +12,7 @@ from wo.core.logging import Log from wo.core.services import WOService from wo.core.shellexec import WOShellExec from wo.core.variables import WOVariables -from wo.cli.plugins.stack_pref import post_pref +from wo.cli.plugins.stack_pref import pre_pref, post_pref class WOStackUpgradeController(CementBaseController): @@ -181,6 +181,9 @@ class WOStackUpgradeController(CementBaseController): if start_upgrade != "Y" and start_upgrade != "y": Log.error(self, "Not starting package update") Log.info(self, "Updating APT packages, please wait...") + if set(WOVariables.wo_nginx).issubset(set(apt_packages)): + pre_pref(self, ['nginx-custom', 'nginx-wo'], + empty_packages) # apt-get update WOAptGet.update(self) if set(WOVariables.wo_php).issubset(set(apt_packages)): From f9bb4d433726b39a1009e920bcebb81f39dc909e Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 22 Aug 2019 14:52:05 +0200 Subject: [PATCH 2/5] Remove wo sync output --- install | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/install b/install index 756ef37..3e4c5d1 100755 --- a/install +++ b/install @@ -851,7 +851,11 @@ else if [ "$wo_travis" = "y" ]; then wo_install_travis | tee -ai $wo_install_log else - wo_install | tee -ai $wo_install_log + if [ -f "$HOME/.gitconfig" ]; then + wo_install >> $wo_install_log 2>&1 + else + wo_install | tee -ai $wo_install_log + fi fi if [ "$ufw" = "y" ]; then wo_lib_echo "Configuring UFW" | tee -ai $wo_install_log @@ -872,7 +876,7 @@ else fi fi - wo sync | tee -ai $wo_install_log + wo sync >> $wo_install_log 2>&1 if [ "$ee_migration" = "1" ]; then echo From 3dab9829544e8d3cf7e21c316648bde7244e7b43 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 22 Aug 2019 15:01:35 +0200 Subject: [PATCH 3/5] Additional info after install --- install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install b/install index 3e4c5d1..d40a208 100755 --- a/install +++ b/install @@ -896,6 +896,9 @@ else echo wo_lib_echo "For autocompletion, run the following command:" wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc" + echo + wo_lib_echo "To install WordOps main stacks, use the command:" + wo_lib_echo_info "wo stack install" fi echo wo_lib_echo "WordOps Documentation : https://docs.wordops.net" From 086da5202b646ac91b16b65c48dc71eb01cbfff1 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 22 Aug 2019 15:04:19 +0200 Subject: [PATCH 4/5] Fix Nginx package pre_pref --- wo/cli/plugins/stack_upgrade.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index f043144..f86a366 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -62,6 +62,7 @@ class WOStackUpgradeController(CementBaseController): # All package update apt_packages = [] packages = [] + nginx_packages = [] empty_packages = [] pargs = pargs = self.app.pargs @@ -89,6 +90,7 @@ class WOStackUpgradeController(CementBaseController): if pargs.nginx: if WOAptGet.is_installed(self, 'nginx-custom'): apt_packages = apt_packages + WOVariables.wo_nginx + nginx_packages = nginx_packages + WOVariables.wo_nginx else: Log.info(self, "Nginx Stable is not already installed") @@ -182,8 +184,7 @@ class WOStackUpgradeController(CementBaseController): Log.error(self, "Not starting package update") Log.info(self, "Updating APT packages, please wait...") if set(WOVariables.wo_nginx).issubset(set(apt_packages)): - pre_pref(self, ['nginx-custom', 'nginx-wo'], - empty_packages) + pre_pref(self, nginx_packages, empty_packages) # apt-get update WOAptGet.update(self) if set(WOVariables.wo_php).issubset(set(apt_packages)): From d6cd58922a1c2f54683746574fbd94e0447e630c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 22 Aug 2019 16:33:56 +0200 Subject: [PATCH 5/5] Fix pre_pref --- wo/cli/plugins/stack_upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index f86a366..b46858c 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -184,7 +184,7 @@ class WOStackUpgradeController(CementBaseController): Log.error(self, "Not starting package update") Log.info(self, "Updating APT packages, please wait...") if set(WOVariables.wo_nginx).issubset(set(apt_packages)): - pre_pref(self, nginx_packages, empty_packages) + pre_pref(self, nginx_packages) # apt-get update WOAptGet.update(self) if set(WOVariables.wo_php).issubset(set(apt_packages)):