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

fix indentation

Browse Source
This commit is contained in:
VirtuBox
2019-03-03 00:16:20 +01:00
parent f1e8b922f4
commit f397509835
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wo/cli/plugins/site.py
View File

@@ -310,7 +310,7 @@ class WOSiteCreateController(CementBaseController):
(['--php'], (['--php'],
dict(help="create php site", action='store_true')), dict(help="create php site", action='store_true')),
(['--php73'], (['--php73'],
dict(help="create php 7.3 site", action='store_true')), dict(help="create php 7.2 site", action='store_true')),
(['--mysql'], (['--mysql'],
dict(help="create mysql site", action='store_true')), dict(help="create mysql site", action='store_true')),
(['--wp'], (['--wp'],
@@ -454,7 +454,7 @@ class WOSiteCreateController(CementBaseController):
Log.error(self, "Can not create HTML site with HHVM") Log.error(self, "Can not create HTML site with HHVM")
if data and self.app.pargs.php73: if data and self.app.pargs.php73:
if (not self.app.pargs.experimental): if (self.app.pargs.experimental):
Log.info(self, "Do you wish to install PHP 7.2 now for {0}?".format(wo_domain)) Log.info(self, "Do you wish to install PHP 7.2 now for {0}?".format(wo_domain))
# Check prompt # Check prompt
@@ -503,7 +503,7 @@ class WOSiteCreateController(CementBaseController):
data['hhvm'] = False data['hhvm'] = False
hhvm = 0 hhvm = 0
if (cache == 'wpredis' and (not self.app.pargs.experimental)): if (cache == 'wpredis' and (self.app.pargs.experimental)):
Log.info(self, "Redis is experimental feature and it may not " Log.info(self, "Redis is experimental feature and it may not "
"work with all CSS/JS/Cache of your site.\nYou can " "work with all CSS/JS/Cache of your site.\nYou can "
"disable it by changing cache later.\nDo you wish" "disable it by changing cache later.\nDo you wish"
@@ -705,9 +705,9 @@ class WOSiteCreateController(CementBaseController):
"`tail /var/log/wo/wordops.log` and please try again") "`tail /var/log/wo/wordops.log` and please try again")
if self.app.pargs.letsencrypt : if self.app.pargs.letsencrypt :
if (not self.app.pargs.experimental): if (self.app.pargs.experimental):
if stype in ['wpsubdomain']: if stype in ['wpsubdomain']:
Log.warn(self, "Wildcard domains are not supported in Lets Encrypt.\nWP SUBDOMAIN site will get SSL for primary site only.") Log.warn(self, "Wildcard domains are not supported in Lets Encrypt.\nWP SUBDOMAIN site will get SSL for primary site only.")
Log.info(self, "Letsencrypt is currently in beta phase." Log.info(self, "Letsencrypt is currently in beta phase."
" \nDo you wish" " \nDo you wish"
@@ -776,7 +776,7 @@ class WOSiteUpdateController(CementBaseController):
(['--php'], (['--php'],
dict(help="update to php site", action='store_true')), dict(help="update to php site", action='store_true')),
(['--php73'], (['--php73'],
dict(help="update to php7 site", dict(help="update to php73 site",
action='store' or 'store_const', action='store' or 'store_const',
choices=('on', 'off'), const='on', nargs='?')), choices=('on', 'off'), const='on', nargs='?')),
(['--mysql'], (['--mysql'],
@@ -1041,19 +1041,19 @@ class WOSiteUpdateController(CementBaseController):
if pargs.php73 == 'on' : if pargs.php73 == 'on' :
data['php73'] = True data['php73'] = True
php73 = True php73 = True
check_php_version= '7.2' check_php_version= '7.3'
elif pargs.php73 == 'off': elif pargs.php73 == 'off':
data['php73'] = False data['php73'] = False
php73 = False php73 = False
check_php_version = '5.6' check_php_version = '7.2'
if pargs.php73: if pargs.php73:
if php73 is old_php73: if php73 is old_php73:
if php73 is False: if php73 is False:
Log.info(self, "PHP 7.2 is already disabled for given " Log.info(self, "PHP 7.3 is already disabled for given "
"site") "site")
elif php73 is True: elif php73 is True:
Log.info(self, "PHP 7.2 is already enabled for given " Log.info(self, "PHP 7.3 is already enabled for given "
"site") "site")
pargs.php73 = False pargs.php73 = False
@@ -1165,11 +1165,11 @@ class WOSiteUpdateController(CementBaseController):
if pargs.hhvm=="on" or pargs.letsencrypt=="on" or pargs.php73=="on": if pargs.hhvm=="on" or pargs.letsencrypt=="on" or pargs.php73=="on":
if pargs.php73 == "on": if pargs.php73 == "on":
if (not pargs.experimental): if (not pargs.experimental):
Log.info(self, "Do you wish to enable PHP 7.2 now for {0}?".format(wo_domain)) Log.info(self, "Do you wish to enable PHP 7.3 now for {0}?".format(wo_domain))
check_prompt = input("Type \"y\" to continue [n]:") check_prompt = input("Type \"y\" to continue [n]:")
if check_prompt != "Y" and check_prompt != "y": if check_prompt != "Y" and check_prompt != "y":
Log.info(self, "Not using PHP 7.2 for site") Log.info(self, "Not using PHP 7.3 for site")
data['php73'] = False data['php73'] = False
php73 = False php73 = False
else: else:
@@ -1225,7 +1225,7 @@ class WOSiteUpdateController(CementBaseController):
if pargs.wpredis and data['currcachetype'] != 'wpredis': if pargs.wpredis and data['currcachetype'] != 'wpredis':
if (not pargs.experimental): if (pargs.experimental):
Log.info(self, "Redis is experimental feature and it may not" Log.info(self, "Redis is experimental feature and it may not"
" work with all plugins of your site.\nYou can " " work with all plugins of your site.\nYou can "
"disable it by changing cache type later.\nDo you wish" "disable it by changing cache type later.\nDo you wish"