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

Fix www added to subdomain

Browse Source
This commit is contained in:
VirtuBox
2019-10-12 11:09:35 +02:00
parent 3c0498c4ad
commit c1dc18360f
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install
View File

@@ -62,6 +62,10 @@ while [ "$#" -gt 0 ]; do
wo_branch="$2"
shift
;;
-v | --version)
wo_version="$2"
shift
;;
--force)
wo_force_install="y"
;;

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

@@ -462,19 +462,20 @@ def setupwordpress(self, data, vhostonly=False):
Log.debug(self, "{0} --allow-root core install "
.format(WOVar.wo_wpcli_path) +
"--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
.format(data['www_domain'], wo_wp_user) +
.format(data['site_name'], wo_wp_user) +
"--admin_password= --admin_email=\'{1}\'"
.format(wo_wp_pass, wo_wp_email))
.format(wo_wp_email))
try:
if WOShellExec.cmd_exec(self, "{0} --allow-root core "
.format(WOVar.wo_wpcli_path) +
"install --url=\'{0}\' --title=\'{0}\' "
"--admin_name=\'{1}\' "
.format(data['www_domain'], wo_wp_user) +
"--admin_password=\'{0}\' "
"--admin_email=\'{1}\'"
.format(wo_wp_pass, wo_wp_email),
log=False):
if WOShellExec.cmd_exec(
self, "{0} --allow-root core "
.format(WOVar.wo_wpcli_path) +
"install --url=\'{0}\' --title=\'{0}\' "
"--admin_name=\'{1}\' "
.format(data['site_name'], wo_wp_user) +
"--admin_password=\'{0}\' "
"--admin_email=\'{1}\'"
.format(wo_wp_pass, wo_wp_email),
log=False):
pass
else:
raise SiteError(
@@ -487,26 +488,27 @@ def setupwordpress(self, data, vhostonly=False):
.format(WOVar.wo_wpcli_path) +
"core multisite-install "
"--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
.format(data['www_domain'], wo_wp_user) +
.format(data['site_name'], wo_wp_user) +
"--admin_password= --admin_email=\'{1}\' "
"{subdomains}"
.format(wo_wp_pass, wo_wp_email,
.format(wo_wp_email,
subdomains='--subdomains'
if not data['wpsubdir'] else ''))
try:
if WOShellExec.cmd_exec(self, "{0} --allow-root "
.format(WOVar.wo_wpcli_path) +
"core multisite-install "
"--url=\'{0}\' --title=\'{0}\' "
"--admin_name=\'{1}\' "
.format(data['www_domain'], wo_wp_user) +
"--admin_password=\'{0}\' "
"--admin_email=\'{1}\' "
"{subdomains}"
.format(wo_wp_pass, wo_wp_email,
subdomains='--subdomains'
if not data['wpsubdir'] else ''),
log=False):
if WOShellExec.cmd_exec(
self, "{0} --allow-root "
.format(WOVar.wo_wpcli_path) +
"core multisite-install "
"--url=\'{0}\' --title=\'{0}\' "
"--admin_name=\'{1}\' "
.format(data['site_name'], wo_wp_user) +
"--admin_password=\'{0}\' "
"--admin_email=\'{1}\' "
"{subdomains}"
.format(wo_wp_pass, wo_wp_email,
subdomains='--subdomains'
if not data['wpsubdir'] else ''),
log=False):
pass
else:
raise SiteError(