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

Fix site_url_https function

Browse Source
This commit is contained in:
VirtuBox
2019-07-29 18:40:42 +02:00
parent 46d95ba84e
commit fad2e6c8a8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,7 @@ class WOSiteCreateController(CementBaseController):
msg="Adding letsencrypts config of site: {0}" msg="Adding letsencrypts config of site: {0}"
.format(wo_domain)) .format(wo_domain))
updateSiteInfo(self, wo_domain, ssl=letsencrypt) updateSiteInfo(self, wo_domain, ssl=letsencrypt)
site_url_https(self, wo_domain, wo_site_webroot) site_url_https(self, data)
elif data['letsencrypt'] is False: elif data['letsencrypt'] is False:
Log.info(self, "Not using Let\'s encrypt for Site " Log.info(self, "Not using Let\'s encrypt for Site "
" http://{0}".format(wo_domain)) " http://{0}".format(wo_domain))

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

@@ -650,7 +650,7 @@ def site_url_https(self, data):
WOFileUtils.chdir(self, '{0}/htdocs/'.format(wo_site_webroot)) WOFileUtils.chdir(self, '{0}/htdocs/'.format(wo_site_webroot))
test_site_url = WOShellExec.cmd_exec(self, "php {0} option get siteurl " test_site_url = WOShellExec.cmd_exec(self, "php {0} option get siteurl "
.format(WOVariables.wo_wpcli_path) + .format(WOVariables.wo_wpcli_path) +
"--allow-root --quiet").split("://") "--allow-root --quiet").split(":")
if not test_site_url[0] == "https": if not test_site_url[0] == "https":
try: try:
WOShellExec.cmd_exec(self, "php {0} option update siteurl " WOShellExec.cmd_exec(self, "php {0} option update siteurl "