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

Several fixes

Browse Source 
* don't deploy ssl certificate if acme.sh failed
* install script issues
* GPG keys error with old EasyEngine Nginx repository
This commit is contained in:
VirtuBox
2019-10-18 10:49:06 +02:00
parent 98e6e6963f
commit 5ad068dc7c
9 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,26 +100,20 @@ class WOStackUpgradeController(CementBaseController):
if pargs.php:
if WOAptGet.is_installed(self, 'php7.2-fpm'):
if not WOAptGet.is_installed(self, 'php7.3-fpm'):
apt_packages = apt_packages + WOVar.wo_php + \
WOVar.wo_php_extra
else:
apt_packages = apt_packages + WOVar.wo_php
apt_packages = apt_packages + WOVar.wo_php + \
WOVar.wo_php_extra
else:
Log.info(self, "PHP 7.2 is not installed")
if pargs.php73:
if WOAptGet.is_installed(self, 'php7.3-fpm'):
if not WOAptGet.is_installed(self, 'php7.2-fpm'):
apt_packages = apt_packages + WOVar.wo_php73 + \
WOVar.wo_php_extra
else:
apt_packages = apt_packages + WOVar.wo_php73
apt_packages = apt_packages + WOVar.wo_php73 + \
WOVar.wo_php_extra
else:
Log.info(self, "PHP 7.3 is not installed")
if pargs.mysql:
if WOAptGet.is_installed(self, 'mariadb-server'):
if WOShellExec.cmd_exec(self, 'mysqladmin ping'):
apt_packages = apt_packages + ['mariadb-server']
else:
Log.info(self, "MariaDB is not installed")
@@ -170,7 +164,7 @@ class WOStackUpgradeController(CementBaseController):
"/var/lib/wo/tmp/pma.tar.gz",
"PHPMyAdmin"]]
else:
Log.error(self, "phpMyAdmin isn't installed")
Log.info(self, "phpMyAdmin isn't installed")
if pargs.composer:
if os.path.isfile('/usr/local/bin/composer'):
@@ -178,7 +172,7 @@ class WOStackUpgradeController(CementBaseController):
"/var/lib/wo/tmp/composer-install",
"Composer"]]
else:
Log.error(self, "Composer isn't installed")
Log.info(self, "Composer isn't installed")
if ((not (apt_packages)) and (not(packages))):
self.app.args.print_help()