Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wo stack upgrade issues

Browse Source
This commit is contained in:
VirtuBox
2019-10-08 02:19:22 +02:00
parent 99d36aaa2d
commit e3f38bb864
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wo/cli/plugins/stack_upgrade.py
View File

@@ -94,7 +94,7 @@ class WOStackUpgradeController(CementBaseController):
if WOAptGet.is_installed(self, 'nginx-custom'): if WOAptGet.is_installed(self, 'nginx-custom'):
apt_packages = apt_packages + WOVar.wo_nginx apt_packages = apt_packages + WOVar.wo_nginx
else: else:
if os.path.isfile(self, '/usr/sbin/nginx'): if os.path.isfile('/usr/sbin/nginx'):
Log.info(self, "Updating Nginx templates") Log.info(self, "Updating Nginx templates")
post_pref(self, WOVar.wo_nginx, []) post_pref(self, WOVar.wo_nginx, [])
else: else:
@@ -186,15 +186,14 @@ class WOStackUpgradeController(CementBaseController):
self.app.args.print_help() self.app.args.print_help()
else: else:
if (apt_packages): if (apt_packages):
if not (set(["php7.2-fpm"]).issubset(set(apt_packages)) and if (("php7.2-fpm" not in apt_packages) and
set(["php7.3-fpm"]).issubset(set(apt_packages)) and ("php7.3-fpm" not in apt_packages) and
set(["nginx-custom", ("nginx-custom" not in apt_packages) and
"nginx-wo"]).issubset(set(apt_packages)) and ("mariadb-server" not in apt_packages)):
set(['mariadb-server']).issubset(set(apt_packages))):
pass pass
else: else:
Log.info( Log.info(
self, "Your site may be down for few seconds if " self, "Your sites may be down for few seconds if "
"you are upgrading Nginx, PHP-FPM, MariaDB or Redis") "you are upgrading Nginx, PHP-FPM, MariaDB or Redis")
# Check prompt # Check prompt
if ((not pargs.no_prompt) and (not pargs.force)): if ((not pargs.no_prompt) and (not pargs.force)):
@@ -219,7 +218,6 @@ class WOStackUpgradeController(CementBaseController):
# check if nginx upgrade is blocked # check if nginx upgrade is blocked
if os.path.isfile( if os.path.isfile(
'/etc/apt/preferences.d/nginx-block'): '/etc/apt/preferences.d/nginx-block'):
apt_packages.remove(WOVar.wo_nginx)
post_pref(self, WOVar.wo_nginx, [], True) post_pref(self, WOVar.wo_nginx, [], True)
# upgrade packages # upgrade packages
WOAptGet.install(self, apt_packages) WOAptGet.install(self, apt_packages)