Rollback

wo/cli/plugins/clean.py

@@ -36,8 +36,8 @@ class WOCleanController(CementBaseController):
     @expose(hide=True)
     def default(self):
         pargs = self.app.pargs
-        if (not (pargs.all or pargs.fastcgi or
-                 pargs.memcached or pargs.opcache or
+        if (not (pargs.all or pargs.fastcgi
+                 or pargs.opcache or
                  pargs.redis)):
             self.clean_fastcgi()
         if pargs.all:

wo/cli/plugins/site.py

@@ -430,7 +430,7 @@ class WOSiteCreateController(CementBaseController):
         pargs.site_name = pargs.site_name.strip()
         (wo_domain, wo_www_domain) = ValidateDomain(pargs.site_name)
         if not wo_domain.strip():
-            Log.error("Invalid domain name, "
+            Log.error(self, "Invalid domain name, "
                       "Provide valid domain name")
 
         wo_site_webroot = WOVariables.wo_webroot + wo_domain

wo/cli/plugins/site_functions.py

@@ -81,10 +81,10 @@ def setupdomain(self, data):
                             out=wo_site_nginx_conf)
         wo_site_nginx_conf.close()
     except IOError as e:
-        Log.debug(self, "{0}".format(e))
+        Log.debug(self, str(e))
         raise SiteError("create nginx configuration failed for site")
     except Exception as e:
-        Log.debug(self, "{0}".format(e))
+        Log.debug(self, str(e))
         raise SiteError("create nginx configuration failed for site")
     finally:
         # Check nginx -t and return status over it
@@ -126,7 +126,7 @@ def setupdomain(self, data):
                                           '{0}/logs/error.log'
                                           .format(wo_site_webroot)])
     except Exception as e:
-        Log.debug(self, "{0}".format(e))
+        Log.debug(self, str(e))
         raise SiteError("setup webroot failed for site")
     finally:
         # TODO Check if directories are setup
@@ -267,7 +267,7 @@ def setupwordpress(self, data, vhostonly=False):
             raise SiteError("download WordPress core failed")
     except CommandExecutionError:
         Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]")
-        raise SiteError(self, "download WordPress core failed")
+        raise SiteError("download WordPress core failed")
 
     Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")
 
@@ -730,6 +730,7 @@ def setupwp_plugin(self, plugin_name, plugin_option, plugin_data, data):
 def setwebrootpermissions(self, webroot):
     Log.debug(self, "Setting up permissions")
     try:
+        WOFileUtils.findBrokenSymlink(self, '/var/www/')
         WOFileUtils.chown(self, webroot, WOVariables.wo_php_user,
                           WOVariables.wo_php_user, recursive=True)
     except Exception as e:
@@ -917,7 +918,7 @@ def updatewpuserpassword(self, wo_domain, wo_site_webroot):
     try:
         wo_wp_user = input("Provide WordPress user name [admin]: ")
     except Exception as e:
-        Log.debug(self, "{0}".format(e))
+        Log.debug(self, str(e))
         Log.error(self, "\nCould not update password")
 
     if wo_wp_user == "?":
@@ -951,7 +952,7 @@ def updatewpuserpassword(self, wo_domain, wo_site_webroot):
                                              "{0} user: "
                                              .format(wo_wp_user))
         except Exception as e:
-            Log.debug(self, "{0}".format(e))
+            Log.debug(self, str(e))
             raise SiteError("failed to read password input ")
 
         try:
@@ -1345,15 +1346,15 @@ def doCleanupAction(self, domain='', webroot='', dbname='', dbuser='',
     if dbname:
         if not dbuser:
             raise SiteError("dbuser not provided")
-            if not dbhost:
-                raise SiteError("dbhost not provided")
+        if not dbhost:
+            raise SiteError("dbhost not provided")
         deleteDB(self, dbname, dbuser, dbhost)
 
 # setup letsencrypt for domain + www.domain
 
 
 def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
-                     wo_dns=False, wo_acme_dns='dns_cf'):
+                     wo_dns=False, wo_acme_dns='dns_cf', backend=False):
 
     if os.path.isfile("/etc/letsencrypt/"
                       "renewal/{0}_ecc/"

wo/cli/plugins/stack_pref.py

@@ -89,7 +89,7 @@ def pre_pref(self, apt_packages):
                                  log=False)
         except CommandExecutionError as e:
             Log.debug(self, "{0}".format(e))
-            Log.error("Failed to initialize MySQL package")
+            Log.error(self, "Failed to initialize MySQL package")
         # generate my.cnf root credentials
         mysql_config = """
             [client]