Several fixes

* don't deploy ssl certificate if acme.sh failed
* install script issues
* GPG keys error with old EasyEngine Nginx repository

wo/cli/plugins/stack_pref.py

@@ -851,7 +851,6 @@ def post_pref(self, apt_packages, packages, upgrade=False):
             WOGit.add(self, ["/etc/proftpd"],
                       msg="Adding ProFTPd into Git")
             if os.path.isfile("/etc/proftpd/proftpd.conf"):
-                Log.info(self, "Configuring ProFTPd")
                 Log.debug(self, "Setting up Proftpd configuration")
                 WOFileUtils.searchreplace(
                     self, "/etc/proftpd/proftpd.conf",

wo/cli/plugins/stack_upgrade.py

@@ -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()

wo/cli/templates/php-pool.mustache

@@ -20,4 +20,4 @@ listen.backlog = 32768
 catch_workers_output = yes
 
 
-{{#openbasedir}}php_admin_value[open_basedir] = "/var/www/:/usr/share/php/:/tmp/:/var/run/nginx-cache/"{{/openbasedir}}
+{{#openbasedir}}php_admin_value[open_basedir] = "/var/www/:/usr/share/php/:/tmp/:/var/run/nginx-cache/:/dev/urandom:/dev/shm"{{/openbasedir}}

wo/core/acme.py

@@ -47,16 +47,17 @@ class WOAcme:
                 .format(all_domains, acme_mode, keylenght)):
             Log.failed(self, "Issuing SSL cert with acme.sh")
             if acmedata['dns'] is True:
-                Log.warn(
+                Log.error(
                     self, "Please make sure your properly "
                     "set your DNS API credentials for acme.sh")
+                return False
             else:
                 Log.error(
                     self, "Your domain is properly configured "
                     "but acme.sh was unable to issue certificate.\n"
                     "You can find more informations in "
-                    "/var/log/wo/wordops.log", False)
-            return False
+                    "/var/log/wo/wordops.log")
+                return False
         else:
             Log.valide(self, "Issuing SSL cert with acme.sh")
             return True

wo/core/variables.py

@@ -13,7 +13,7 @@ class WOVar():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.9.9.3"
+    wo_version = "3.9.9.4"
     # WordOps packages versions
     wo_wp_cli = "2.3.0"
     wo_adminer = "4.7.3"

wo/utils/test.py

@@ -1,6 +1,6 @@
 """Testing utilities for WordOps"""
-from wo.cli.main import WOTestApp
 from cement.utils.test import *
+from wo.cli.main import WOTestApp
 
 
 class WOTestCase(CementTestCase):