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-13 11:59:13 +01:00
parent 1d971dbb7d
commit cda4f6448d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,6 @@ class WOSiteController(CementBaseController):
wo_db_user = '' wo_db_user = ''
wo_db_pass = '' wo_db_pass = ''
if not check_domain_exists(self, wo_domain): if not check_domain_exists(self, wo_domain):
Log.error(self, "site {0} does not exist".format(wo_domain)) Log.error(self, "site {0} does not exist".format(wo_domain))
if os.path.isfile('/etc/nginx/sites-available/{0}' if os.path.isfile('/etc/nginx/sites-available/{0}'
@@ -446,7 +445,6 @@ class WOSiteCreateController(CementBaseController):
else: else:
pass pass
if data and self.app.pargs.php73: if data and self.app.pargs.php73:
if (self.app.pargs.experimental): if (self.app.pargs.experimental):
Log.info( Log.info(
@@ -883,7 +881,7 @@ class WOSiteUpdateController(CementBaseController):
Log.info(self, "\nPassword Unchanged.") Log.info(self, "\nPassword Unchanged.")
return 0 return 0
if ((stype == 'php' and if ((stype == 'php' and
oldsitetype not in ['html', 'proxy', 'php73']) or oldsitetype not in ['html', 'proxy', 'php73']) or
(stype == 'mysql' and oldsitetype not in ['html', 'php', (stype == 'mysql' and oldsitetype not in ['html', 'php',
'proxy', 'php73']) or 'proxy', 'php73']) or
@@ -1159,8 +1157,7 @@ class WOSiteUpdateController(CementBaseController):
data['basic'] = True data['basic'] = True
cache = 'basic' cache = 'basic'
if (php73 is old_php73) and if (php73 is old_php73) and (stype == oldsitetype and cache == oldcachetype):
(stype == oldsitetype and cache == oldcachetype)):
return 1 return 1
if not data: if not data:
@@ -1199,8 +1196,8 @@ class WOSiteUpdateController(CementBaseController):
return 1 return 1
if 'proxy' in data.keys() and data['proxy']: if 'proxy' in data.keys() and data['proxy']:
updateSiteInfo(self, wo_domain, stype=stype, cache=cache, updateSiteInfo(self, wo_domain, stype = stype, cache = cache,
ssl=True if check_site.is_ssl else False) ssl = True if check_site.is_ssl else False)
Log.info(self, "Successfully updated site" Log.info(self, "Successfully updated site"
" http://{0}".format(wo_domain)) " http://{0}".format(wo_domain))
return 0 return 0

1
wo/cli/plugins/site_functions.py
View File

@@ -153,7 +153,6 @@ def setupdatabase(self, data):
wo_db_username = '' wo_db_username = ''
wo_db_password = '' wo_db_password = ''
if prompt_dbname == 'True' or prompt_dbname == 'true': if prompt_dbname == 'True' or prompt_dbname == 'true':
try: try:
wo_db_name = input('Enter the MySQL database name [{0}]: ' wo_db_name = input('Enter the MySQL database name [{0}]: '