diff --git a/wo/cli/plugins/clean.py b/wo/cli/plugins/clean.py index b94e5f8..6400c13 100644 --- a/wo/cli/plugins/clean.py +++ b/wo/cli/plugins/clean.py @@ -19,7 +19,8 @@ class WOCleanController(CementBaseController): label = 'clean' stacked_on = 'base' stacked_type = 'nested' - description = ('Clean NGINX FastCGI cache, Opcache, Memcached, Redis Cache') + description = ( + 'Clean NGINX FastCGI cache, Opcache, Memcached, Redis Cache') arguments = [ (['--all'], dict(help='Clean all cache', action='store_true')), @@ -31,7 +32,7 @@ class WOCleanController(CementBaseController): dict(help='Clean OpCache', action='store_true')), (['--redis'], dict(help='Clean Redis Cache', action='store_true')), - ] + ] usage = "wo clean [options]" @expose(hide=True) @@ -90,13 +91,13 @@ class WOCleanController(CementBaseController): wp = urllib.request.urlopen(" https://127.0.0.1:22222/cache" "/opcache/opgui.php?page=reset").read() except Exception as e: - Log.debug(self, "{0}".format(e)) - Log.debug(self, "Unable hit url, " - " https://127.0.0.1:22222/cache/opcache/opgui.php?page=reset," - " please check you have admin tools installed") - Log.debug(self, "please check you have admin tools installed," - " or install them with `wo stack install --admin`") - Log.error(self, "Unable to clean opcache", False) + Log.debug(self, "{0}".format(e)) + Log.debug(self, "Unable hit url, " + " https://127.0.0.1:22222/cache/opcache/opgui.php?page=reset," + " please check you have admin tools installed") + Log.debug(self, "please check you have admin tools installed," + " or install them with `wo stack install --admin`") + Log.error(self, "Unable to clean opcache", False) def load(app): diff --git a/wo/cli/plugins/info.py b/wo/cli/plugins/info.py index 16309a3..467334a 100644 --- a/wo/cli/plugins/info.py +++ b/wo/cli/plugins/info.py @@ -41,9 +41,9 @@ class WOInfoController(CementBaseController): @expose(hide=True) def info_nginx(self): """Display Nginx information""" - version = os.popen("nginx -v 2>&1 | cut -d':' -f2 | cut -d' ' -f2 | " - "cut -d'/' -f2 | tr -d '\n'").read() - allow = os.popen("grep ^allow /etc/nginx/common/acl.conf | " + version = os.popen("nginx -v 2 > &1 | awk - F '/' '{print $2}' | '" + "awk -F ' ' '{print $1}'").read() + allow = os.popen("grep allow /etc/nginx/common/acl.conf | " "cut -d' ' -f2 | cut -d';' -f1 | tr '\n' ' '").read() nc = NginxConfig() nc.loadf('/etc/nginx/nginx.conf') @@ -242,8 +242,8 @@ class WOInfoController(CementBaseController): @expose(hide=True) def default(self): """default function for info""" - if (not self.app.pargs.nginx and not self.app.pargs.php - and not self.app.pargs.mysql and not self.app.pargs.php73): + if (not self.app.pargs.nginx and not self.app.pargs.php and + not self.app.pargs.mysql and not self.app.pargs.php73): self.app.pargs.nginx = True self.app.pargs.php = True self.app.pargs.mysql = True @@ -251,7 +251,8 @@ class WOInfoController(CementBaseController): self.app.pargs.php73 = True if self.app.pargs.nginx: - if WOAptGet.is_installed(self, 'nginx-custom') or WOAptGet.is_installed(self, 'nginx-common'): + if (WOAptGet.is_installed(self, 'nginx-custom') or + WOAptGet.is_installed(self, 'nginx-common')): self.info_nginx() else: Log.error(self, "Nginx is not installed") diff --git a/wo/cli/plugins/log.py b/wo/cli/plugins/log.py index 6ee45c0..5f7436f 100644 --- a/wo/cli/plugins/log.py +++ b/wo/cli/plugins/log.py @@ -196,20 +196,20 @@ class WOLogResetController(CementBaseController): if self.app.pargs.php: self.app.pargs.nginx = True - if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) - and (not self.app.pargs.mysql) and (not self.app.pargs.access) - and (not self.app.pargs.wp) and (not self.app.pargs.site_name) - and (not self.app.pargs.slow_log_db)): + if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) and + (not self.app.pargs.mysql) and (not self.app.pargs.access) and + (not self.app.pargs.wp) and (not self.app.pargs.site_name) and + (not self.app.pargs.slow_log_db)): self.app.pargs.nginx = True self.app.pargs.fpm = True self.app.pargs.mysql = True self.app.pargs.access = True self.app.pargs.slow_log_db = True - if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) - and (not self.app.pargs.mysql) and (not self.app.pargs.access) - and (not self.app.pargs.wp) and (self.app.pargs.site_name) - and (not self.app.pargs.slow-log-db)): + if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) and + (not self.app.pargs.mysql) and (not self.app.pargs.access) and + (not self.app.pargs.wp) and (self.app.pargs.site_name) and + (not self.app.pargs.slow-log-db)): self.app.pargs.nginx = True self.app.pargs.wp = True self.app.pargs.access = True @@ -335,17 +335,17 @@ class WOLogGzipController(CementBaseController): if self.app.pargs.php: self.app.pargs.nginx = True - if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) - and (not self.app.pargs.mysql) and (not self.app.pargs.access) - and (not self.app.pargs.wp) and (not self.app.pargs.site_name)): + if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) and + (not self.app.pargs.mysql) and (not self.app.pargs.access) and + (not self.app.pargs.wp) and (not self.app.pargs.site_name)): self.app.pargs.nginx = True self.app.pargs.fpm = True self.app.pargs.mysql = True self.app.pargs.access = True - if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) - and (not self.app.pargs.mysql) and (not self.app.pargs.access) - and (not self.app.pargs.wp) and (self.app.pargs.site_name)): + if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) and + (not self.app.pargs.mysql) and (not self.app.pargs.access) and + (not self.app.pargs.wp) and (self.app.pargs.site_name)): self.app.pargs.nginx = True self.app.pargs.wp = True self.app.pargs.access = True @@ -472,17 +472,17 @@ class WOLogMailController(CementBaseController): if self.app.pargs.php: self.app.pargs.nginx = True - if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) - and (not self.app.pargs.mysql) and (not self.app.pargs.access) - and (not self.app.pargs.wp) and (not self.app.pargs.site_name)): + if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) and + (not self.app.pargs.mysql) and (not self.app.pargs.access) and + (not self.app.pargs.wp) and (not self.app.pargs.site_name)): self.app.pargs.nginx = True self.app.pargs.fpm = True self.app.pargs.mysql = True self.app.pargs.access = True - if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) - and (not self.app.pargs.mysql) and (not self.app.pargs.access) - and (not self.app.pargs.wp) and (self.app.pargs.site_name)): + if ((not self.app.pargs.nginx) and (not self.app.pargs.fpm) and + (not self.app.pargs.mysql) and (not self.app.pargs.access) and + (not self.app.pargs.wp) and (self.app.pargs.site_name)): self.app.pargs.nginx = True self.app.pargs.wp = True self.app.pargs.access = True diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 36bee17..92dcf5f 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -1099,7 +1099,7 @@ class WOSiteUpdateController(CementBaseController): else: data['letsencrypt'] = True letsencrypt = True - wildcard = True + wildcard = False if pargs.wpredis and data['currcachetype'] != 'wpredis': data['wpredis'] = True diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 9f0c781..05c90b4 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1194,9 +1194,9 @@ def doCleanupAction(self, domain='', webroot='', dbname='', dbuser='', raise SiteError("dbhost not provided") deleteDB(self, dbname, dbuser, dbhost) + + # setup letsencrypt for domain + www.domain - - def setupLetsEncrypt(self, wo_domain_name): if os.path.isfile("/etc/letsencrypt/renewal/{0}_ecc/{0}.conf" @@ -1450,16 +1450,16 @@ def archivedCertificateHandle(self, domain): "certificate for your site.\nIt may take a " "few minutes depending on your network.") ssl = WOShellExec.cmd_exec(self, "mkdir -p {0}/{1} && " - "/etc/letsencrypt/acme.sh " - "--config-home " - "'/etc/letsencrypt/config' " - "--install-cert -d {1} --ecc " - "--cert-file {0}/{1}/cert.pem " - "--key-file {0}/{1}/key.pem " - "--fullchain-file " - "{0}/{1}/fullchain.pem " - "--reloadcmd " - "\"service nginx restart\" " + "/etc/letsencrypt/acme.sh " + "--config-home " + "'/etc/letsencrypt/config' " + "--install-cert -d {1} --ecc " + "--cert-file {0}/{1}/cert.pem " + "--key-file {0}/{1}/key.pem " + "--fullchain-file " + "{0}/{1}/fullchain.pem " + "--reloadcmd " + "\"service nginx restart\" " .format(WOVariables.wo_ssl_live, domain)) if ssl: @@ -1511,7 +1511,7 @@ def archivedCertificateHandle(self, domain): "--force" .format(domain)) - if issuessl: + if ssl: try: