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" wo_branch="$2"
shift shift
;; ;;
-v | --version)
wo_version="$2"
shift
;;
--force) --force)
wo_force_install="y" 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 " Log.debug(self, "{0} --allow-root core install "
.format(WOVar.wo_wpcli_path) + .format(WOVar.wo_wpcli_path) +
"--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' " "--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}\'" "--admin_password= --admin_email=\'{1}\'"
.format(wo_wp_pass, wo_wp_email)) .format(wo_wp_email))
try: try:
if WOShellExec.cmd_exec(self, "{0} --allow-root core " if WOShellExec.cmd_exec(
.format(WOVar.wo_wpcli_path) + self, "{0} --allow-root core "
"install --url=\'{0}\' --title=\'{0}\' " .format(WOVar.wo_wpcli_path) +
"--admin_name=\'{1}\' " "install --url=\'{0}\' --title=\'{0}\' "
.format(data['www_domain'], wo_wp_user) + "--admin_name=\'{1}\' "
"--admin_password=\'{0}\' " .format(data['site_name'], wo_wp_user) +
"--admin_email=\'{1}\'" "--admin_password=\'{0}\' "
.format(wo_wp_pass, wo_wp_email), "--admin_email=\'{1}\'"
log=False): .format(wo_wp_pass, wo_wp_email),
log=False):
pass pass
else: else:
raise SiteError( raise SiteError(
@@ -487,26 +488,27 @@ def setupwordpress(self, data, vhostonly=False):
.format(WOVar.wo_wpcli_path) + .format(WOVar.wo_wpcli_path) +
"core multisite-install " "core multisite-install "
"--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' " "--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}\' " "--admin_password= --admin_email=\'{1}\' "
"{subdomains}" "{subdomains}"
.format(wo_wp_pass, wo_wp_email, .format(wo_wp_email,
subdomains='--subdomains' subdomains='--subdomains'
if not data['wpsubdir'] else '')) if not data['wpsubdir'] else ''))
try: try:
if WOShellExec.cmd_exec(self, "{0} --allow-root " if WOShellExec.cmd_exec(
.format(WOVar.wo_wpcli_path) + self, "{0} --allow-root "
"core multisite-install " .format(WOVar.wo_wpcli_path) +
"--url=\'{0}\' --title=\'{0}\' " "core multisite-install "
"--admin_name=\'{1}\' " "--url=\'{0}\' --title=\'{0}\' "
.format(data['www_domain'], wo_wp_user) + "--admin_name=\'{1}\' "
"--admin_password=\'{0}\' " .format(data['site_name'], wo_wp_user) +
"--admin_email=\'{1}\' " "--admin_password=\'{0}\' "
"{subdomains}" "--admin_email=\'{1}\' "
.format(wo_wp_pass, wo_wp_email, "{subdomains}"
subdomains='--subdomains' .format(wo_wp_pass, wo_wp_email,
if not data['wpsubdir'] else ''), subdomains='--subdomains'
log=False): if not data['wpsubdir'] else ''),
log=False):
pass pass
else: else:
raise SiteError( raise SiteError(