Browse Source

Merge updateall => master

bugfixes
harshadyeola 10 years ago
parent
commit
89b133e1c3
  1. 16
      config/bash_completion.d/ee_auto.rc
  2. 194
      ee/cli/plugins/site.py
  3. 14
      ee/cli/plugins/site_functions.py
  4. 4
      ee/cli/templates/virtualconf.mustache

16
config/bash_completion.d/ee_auto.rc

@ -93,7 +93,7 @@ _ee_complete()
-- $cur) ) -- $cur) )
;; ;;
"edit" | "enable" | "info" | "log" | "show" | "cd" | "update" | "delete") "edit" | "enable" | "info" | "log" | "show" | "cd" | "delete")
if [ ${COMP_WORDS[1]} == "log" ]; then if [ ${COMP_WORDS[1]} == "log" ]; then
COMPREPLY=( $(compgen \ COMPREPLY=( $(compgen \
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access" \ -W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access" \
@ -104,7 +104,11 @@ _ee_complete()
-- $cur) ) -- $cur) )
fi fi
;; ;;
"update")
COMPREPLY=( $(compgen \
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --all" \
-- $cur) )
;;
"gzip") "gzip")
COMPREPLY=( $(compgen \ COMPREPLY=( $(compgen \
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access" \ -W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access" \
@ -235,7 +239,6 @@ _ee_complete()
elif [ ${COMP_WORDS[2]} == "reset" ]; then elif [ ${COMP_WORDS[2]} == "reset" ]; then
retlist="--access --nginx --php --mysql --fpm --wp --slow-log-db" retlist="--access --nginx --php --mysql --fpm --wp --slow-log-db"
elif [ ${COMP_WORDS[2]} == "mail" ]; then elif [ ${COMP_WORDS[2]} == "mail" ]; then
retlist="--access --nginx --php --mysql --fpm --wp --to=" retlist="--access --nginx --php --mysql --fpm --wp --to="
@ -258,9 +261,12 @@ _ee_complete()
"--all") "--all")
if [ ${COMP_WORDS[1]} == "clean" ]; then if [ ${COMP_WORDS[1]} == "clean" ]; then
retlist="--memcache --opcache --fastcgi" retlist="--memcache --opcache --fastcgi"
else elif [ ${COMP_WORDS[2]} == "delete" ]; then
retlist="--db --files" retlist="--db --files"
elif [ ${COMP_WORDS[2]} == "update" ]; then
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off"
else
retlist=""
fi fi
ret="${retlist[@]/$prev}" ret="${retlist[@]/$prev}"
COMPREPLY=( $(compgen \ COMPREPLY=( $(compgen \

194
ee/cli/plugins/site.py

@ -604,34 +604,64 @@ class EESiteUpdateController(CementBaseController):
(['--pagespeed'], (['--pagespeed'],
dict(help='Use PageSpeed for site', dict(help='Use PageSpeed for site',
action='store' or 'store_const', action='store' or 'store_const',
choices=('on', 'off'), const='on', nargs='?')) choices=('on', 'off'), const='on', nargs='?')),
(['--all'],
dict(help="update all sites", action='store_true')),
] ]
@expose(help="Update site type or cache") @expose(help="Update site type or cache")
def default(self): def default(self):
pargs = self.app.pargs
if pargs.all:
if pargs.site_name:
Log.error(self, "`--all` option cannot be used with site name"
" provided")
if pargs.html:
Log.error(self, "No site can be updated to html")
if not (pargs.php or
pargs.mysql or pargs.wp or pargs.wpsubdir or
pargs.wpsubdomain or pargs.w3tc or pargs.wpfc or
pargs.wpsc or pargs.hhvm or pargs.pagespeed):
Log.error(self, "Please provide options to update sites.")
if pargs.all:
sites = getAllsites(self)
if not sites:
pass
else:
for site in sites:
pargs.site_name = site.sitename
Log.info(self, Log.ENDC + Log.BOLD + "Updating site {0},"
" please wait ..."
.format(pargs.site_name))
self.doupdatesite(pargs)
print("\n")
else:
self.doupdatesite(pargs)
def doupdatesite(self, pargs):
hhvm = None hhvm = None
pagespeed = None pagespeed = None
data = dict() data = dict()
try: try:
stype, cache = detSitePar(vars(self.app.pargs)) stype, cache = detSitePar(vars(pargs))
except RuntimeError as e: except RuntimeError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Please provide valid options combination for" Log.error(self, "Please provide valid options combination for"
" site update") " site update")
if not self.app.pargs.site_name: if not pargs.site_name:
try: try:
while not self.app.pargs.site_name: while not pargs.site_name:
self.app.pargs.site_name = (input('Enter site name : ') pargs.site_name = (input('Enter site name : ').strip())
.strip())
except IOError as e: except IOError as e:
Log.error(self, 'Unable to input site name, Please try again!') Log.error(self, 'Unable to input site name, Please try again!')
self.app.pargs.site_name = self.app.pargs.site_name.strip() pargs.site_name = pargs.site_name.strip()
(ee_domain, (ee_domain,
ee_www_domain, ) = ValidateDomain(self.app.pargs.site_name) ee_www_domain, ) = ValidateDomain(pargs.site_name)
ee_site_webroot = EEVariables.ee_webroot + ee_domain ee_site_webroot = EEVariables.ee_webroot + ee_domain
check_site = getSiteInfo(self, ee_domain) check_site = getSiteInfo(self, ee_domain)
@ -644,16 +674,20 @@ class EESiteUpdateController(CementBaseController):
old_hhvm = check_site.is_hhvm old_hhvm = check_site.is_hhvm
old_pagespeed = check_site.is_pagespeed old_pagespeed = check_site.is_pagespeed
if (self.app.pargs.password and not (self.app.pargs.html or if (pargs.password and not (pargs.html or
self.app.pargs.php or self.app.pargs.mysql or self.app.pargs.wp or pargs.php or pargs.mysql or pargs.wp or
self.app.pargs.w3tc or self.app.pargs.wpfc or self.app.pargs.wpsc pargs.w3tc or pargs.wpfc or pargs.wpsc
or self.app.pargs.wpsubdir or self.app.pargs.wpsubdomain)): or pargs.wpsubdir or pargs.wpsubdomain)):
try: try:
updatewpuserpassword(self, ee_domain, ee_site_webroot) updatewpuserpassword(self, ee_domain, ee_site_webroot)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Password Unchanged.") Log.info(self, "Password Unchanged.")
self.app.close(0) return 0
if stype == "html" and stype == oldsitetype and self.app.pargs.hhvm:
Log.info(self, Log.FAIL + "Can not update HTML site to HHVM")
return 1
if ((stype == 'php' and oldsitetype != 'html') or if ((stype == 'php' and oldsitetype != 'html') or
(stype == 'mysql' and oldsitetype not in ['html', 'php']) or (stype == 'mysql' and oldsitetype not in ['html', 'php']) or
@ -661,9 +695,11 @@ class EESiteUpdateController(CementBaseController):
'wp']) or 'wp']) or
(stype == 'wpsubdir' and oldsitetype in ['wpsubdomain']) or (stype == 'wpsubdir' and oldsitetype in ['wpsubdomain']) or
(stype == 'wpsubdomain' and oldsitetype in ['wpsubdir']) or (stype == 'wpsubdomain' and oldsitetype in ['wpsubdir']) or
(stype == oldsitetype and cache == oldcachetype)): (stype == oldsitetype and cache == oldcachetype) and
Log.error(self, "can not update {0} {1} to {2} {3}". not pargs.pagespeed):
format(oldsitetype, oldcachetype, stype, cache)) Log.info(self, Log.FAIL + "can not update {0} {1} to {2} {3}".
format(oldsitetype, oldcachetype, stype, cache))
return 1
if stype == 'php': if stype == 'php':
data = dict(site_name=ee_domain, www_domain=ee_www_domain, data = dict(site_name=ee_domain, www_domain=ee_www_domain,
@ -691,7 +727,7 @@ class EESiteUpdateController(CementBaseController):
if stype == 'wpsubdir': if stype == 'wpsubdir':
data['wpsubdir'] = True data['wpsubdir'] = True
if self.app.pargs.pagespeed or self.app.pargs.hhvm: if pargs.pagespeed or pargs.hhvm:
if not data: if not data:
data = dict(site_name=ee_domain, www_domain=ee_www_domain, data = dict(site_name=ee_domain, www_domain=ee_www_domain,
currsitetype=oldsitetype, currsitetype=oldsitetype,
@ -748,30 +784,30 @@ class EESiteUpdateController(CementBaseController):
data['wpfc'] = False data['wpfc'] = False
data['wpsc'] = True data['wpsc'] = True
if self.app.pargs.hhvm != 'off': if pargs.hhvm != 'off':
data['hhvm'] = True data['hhvm'] = True
hhvm = True hhvm = True
elif self.app.pargs.hhvm == 'off': elif pargs.hhvm == 'off':
data['hhvm'] = False data['hhvm'] = False
hhvm = False hhvm = False
if self.app.pargs.pagespeed != 'off': if pargs.pagespeed != 'off':
data['pagespeed'] = True data['pagespeed'] = True
pagespeed = True pagespeed = True
elif self.app.pargs.pagespeed == 'off': elif pargs.pagespeed == 'off':
data['pagespeed'] = False data['pagespeed'] = False
pagespeed = False pagespeed = False
if self.app.pargs.pagespeed: if pargs.pagespeed:
if pagespeed is old_pagespeed: if pagespeed is old_pagespeed:
if pagespeed is False: if pagespeed is False:
Log.info(self, "Pagespeed is allready disabled for given " Log.info(self, "Pagespeed is already disabled for given "
"site") "site")
elif pagespeed is True: elif pagespeed is True:
Log.info(self, "Pagespeed is allready enabled for given " Log.info(self, "Pagespeed is allready enabled for given "
"site") "site")
if self.app.pargs.hhvm: if pargs.hhvm:
if hhvm is old_hhvm: if hhvm is old_hhvm:
if hhvm is False: if hhvm is False:
Log.info(self, "HHVM is allready disabled for given " Log.info(self, "HHVM is allready disabled for given "
@ -780,7 +816,7 @@ class EESiteUpdateController(CementBaseController):
Log.info(self, "HHVM is allready enabled for given " Log.info(self, "HHVM is allready enabled for given "
"site") "site")
if data and (not self.app.pargs.hhvm): if data and (not pargs.hhvm):
if old_hhvm is True: if old_hhvm is True:
data['hhvm'] = True data['hhvm'] = True
hhvm = True hhvm = True
@ -788,7 +824,7 @@ class EESiteUpdateController(CementBaseController):
data['hhvm'] = False data['hhvm'] = False
hhvm = False hhvm = False
if data and (not self.app.pargs.pagespeed): if data and (not pargs.pagespeed):
if old_pagespeed is True: if old_pagespeed is True:
data['pagespeed'] = True data['pagespeed'] = True
pagespeed = True pagespeed = True
@ -796,13 +832,13 @@ class EESiteUpdateController(CementBaseController):
data['pagespeed'] = False data['pagespeed'] = False
pagespeed = False pagespeed = False
if self.app.pargs.pagespeed or self.app.pargs.hhvm: if pargs.pagespeed or pargs.hhvm:
if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
(stype == oldsitetype and cache == oldcachetype)): (stype == oldsitetype and cache == oldcachetype)):
self.app.close(0) return 1
if not data: if not data:
Log.error(self, " Cannot update {0}, Invalid Options" Log.error(self, "Cannot update {0}, Invalid Options"
.format(ee_domain)) .format(ee_domain))
ee_auth = site_package_check(self, stype) ee_auth = site_package_check(self, stype)
@ -810,23 +846,33 @@ class EESiteUpdateController(CementBaseController):
data['ee_db_user'] = check_site.db_user data['ee_db_user'] = check_site.db_user
data['ee_db_pass'] = check_site.db_password data['ee_db_pass'] = check_site.db_password
data['ee_db_host'] = check_site.db_host data['ee_db_host'] = check_site.db_host
try:
pre_run_checks(self)
except SiteError as e:
Log.debug(self, str(e))
Log.error(self, "NGINX configuration check failed.")
try: try:
sitebackup(self, data) sitebackup(self, data)
except Exception as e: except Exception as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Check logs for reason " Log.info(self, Log.FAIL + "Check logs for reason "
"`tail /var/log/ee/ee.log` & Try Again!!!") "`tail /var/log/ee/ee.log` & Try Again!!!")
return 1
# setup NGINX configuration, and webroot # setup NGINX configuration, and webroot
try: try:
setupdomain(self, data) setupdomain(self, data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason " Log.info(self, Log.FAIL + "Update site failed."
"`tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason"
"`tail /var/log/ee/ee.log` & Try Again!!!")
return 1
# Update pagespeed config # Update pagespeed config
if self.app.pargs.pagespeed: if pargs.pagespeed:
operateOnPagespeed(self, data) operateOnPagespeed(self, data)
if stype == oldsitetype and cache == oldcachetype: if stype == oldsitetype and cache == oldcachetype:
@ -839,15 +885,17 @@ class EESiteUpdateController(CementBaseController):
Log.info(self, "Successfully updated site" Log.info(self, "Successfully updated site"
" http://{0}".format(ee_domain)) " http://{0}".format(ee_domain))
self.app.close(0) return 0
if 'ee_db_name' in data.keys() and not data['wp']: if 'ee_db_name' in data.keys() and not data['wp']:
try: try:
data = setupdatabase(self, data) data = setupdatabase(self, data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason " Log.info(self, Log.FAIL + "Update site failed."
"`tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason"
"`tail /var/log/ee/ee.log` & Try Again!!!")
return 1
try: try:
eedbconfig = open("{0}/ee-config.php".format(ee_site_webroot), eedbconfig = open("{0}/ee-config.php".format(ee_site_webroot),
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
@ -863,28 +911,10 @@ class EESiteUpdateController(CementBaseController):
except IOError as e: except IOError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.debug(self, "creating ee-config.php failed.") Log.debug(self, "creating ee-config.php failed.")
Log.error(self, "Update site failed. Check logs for reason " Log.info(self, Log.FAIL + "Update site failed. "
"`tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason "
"`tail /var/log/ee/ee.log` & Try Again!!!")
# if oldsitetype == 'mysql': return 1
# # config_file = (ee_site_webroot + '/backup/{0}/ee-config.php'
# # .format(EEVariables.ee_date))
# # data['ee_db_name'] = (EEFileUtils.grep(self, config_file,
# # 'DB_NAME')
# # .split(',')[1]
# # .split(')')[0].strip())
# # data['ee_db_user'] = (EEFileUtils.grep(self, config_file,
# # 'DB_USER')
# # .split(',')[1]
# # .split(')')[0].strip())
# # data['ee_db_pass'] = (EEFileUtils.grep(self, config_file,
# # 'DB_PASSWORD')
# # .split(',')[1]
# # .split(')')[0].strip())
# # data['ee_db_host'] = (EEFileUtils.grep(self, config_file,
# # 'DB_HOST')
# # .split(',')[1]
# # .split(')')[0].strip())
# Setup WordPress if old sites are html/php/mysql sites # Setup WordPress if old sites are html/php/mysql sites
if data['wp'] and oldsitetype in ['html', 'php', 'mysql']: if data['wp'] and oldsitetype in ['html', 'php', 'mysql']:
@ -892,8 +922,10 @@ class EESiteUpdateController(CementBaseController):
ee_wp_creds = setupwordpress(self, data) ee_wp_creds = setupwordpress(self, data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason " Log.info(self, Log.FAIL + "Update site failed."
"`tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason "
"`tail /var/log/ee/ee.log` & Try Again!!!")
return 1
# Uninstall unnecessary plugins # Uninstall unnecessary plugins
if oldsitetype in ['wp', 'wpsubdir', 'wpsubdomain']: if oldsitetype in ['wp', 'wpsubdir', 'wpsubdomain']:
@ -904,8 +936,10 @@ class EESiteUpdateController(CementBaseController):
setupwordpressnetwork(self, data) setupwordpressnetwork(self, data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason" Log.info(self, Log.FAIL + "Update site failed. "
" `tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason"
" `tail /var/log/ee/ee.log` & Try Again!!!")
return 1
if (oldcachetype == 'w3tc' or oldcachetype == 'wpfc' and if (oldcachetype == 'w3tc' or oldcachetype == 'wpfc' and
not (data['w3tc'] or data['wpfc'])): not (data['w3tc'] or data['wpfc'])):
@ -913,16 +947,20 @@ class EESiteUpdateController(CementBaseController):
uninstallwp_plugin(self, 'w3-total-cache', data) uninstallwp_plugin(self, 'w3-total-cache', data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason" Log.info(self, Log.FAIL + "Update site failed. "
" `tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason"
" `tail /var/log/ee/ee.log` & Try Again!!!")
return 1
if oldcachetype == 'wpsc' and not data['wpsc']: if oldcachetype == 'wpsc' and not data['wpsc']:
try: try:
uninstallwp_plugin(self, 'wp-super-cache', data) uninstallwp_plugin(self, 'wp-super-cache', data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason" Log.info(self, Log.FAIL + "Update site failed."
" `tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason"
" `tail /var/log/ee/ee.log` & Try Again!!!")
return 1
if (oldcachetype != 'w3tc' or oldcachetype != 'wpfc') and (data['w3tc'] if (oldcachetype != 'w3tc' or oldcachetype != 'wpfc') and (data['w3tc']
or data['wpfc']): or data['wpfc']):
@ -930,17 +968,20 @@ class EESiteUpdateController(CementBaseController):
installwp_plugin(self, 'w3-total-cache', data) installwp_plugin(self, 'w3-total-cache', data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason" Log.info(self, Log.FAIL + "Update site failed."
" `tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason"
" `tail /var/log/ee/ee.log` & Try Again!!!")
return 1
if oldcachetype != 'wpsc' and data['wpsc']: if oldcachetype != 'wpsc' and data['wpsc']:
try: try:
installwp_plugin(self, 'wp-super-cache', data) installwp_plugin(self, 'wp-super-cache', data)
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason " Log.info(self, Log.FAIL + "Update site failed."
"`tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason "
"`tail /var/log/ee/ee.log` & Try Again!!!")
return 1
# Service Nginx Reload # Service Nginx Reload
EEService.reload_service(self, 'nginx') EEService.reload_service(self, 'nginx')
@ -952,8 +993,10 @@ class EESiteUpdateController(CementBaseController):
setwebrootpermissions(self, data['webroot']) setwebrootpermissions(self, data['webroot'])
except SiteError as e: except SiteError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, "Update site failed. Check logs for reason " Log.info(self, Log.FAIL + "Update site failed."
"`tail /var/log/ee/ee.log` & Try Again!!!") "Check logs for reason "
"`tail /var/log/ee/ee.log` & Try Again!!!")
return 1
if ee_auth and len(ee_auth): if ee_auth and len(ee_auth):
for msg in ee_auth: for msg in ee_auth:
@ -977,6 +1020,7 @@ class EESiteUpdateController(CementBaseController):
hhvm=hhvm, pagespeed=pagespeed) hhvm=hhvm, pagespeed=pagespeed)
Log.info(self, "Successfully updated site" Log.info(self, "Successfully updated site"
" http://{0}".format(ee_domain)) " http://{0}".format(ee_domain))
return 0
class EESiteDeleteController(CementBaseController): class EESiteDeleteController(CementBaseController):

14
ee/cli/plugins/site_functions.py

@ -28,6 +28,20 @@ class SiteError(Exception):
return repr(self.message) return repr(self.message)
def pre_run_checks(self):
# Check nginx configuration
Log.info(self, "Running pre-update checks, please wait ...")
try:
Log.debug(self, "checking NGINX configuration ...")
FNULL = open('/dev/null', 'w')
ret = subprocess.check_call(["nginx", "-t"], stdout=FNULL,
stderr=subprocess.STDOUT)
except CalledProcessError as e:
Log.debug(self, "{0}".format(str(e)))
raise SiteError("nginx configuration check failed.")
def check_domain_exists(self, domain): def check_domain_exists(self, domain):
if getSiteInfo(self, domain): if getSiteInfo(self, domain):
return True return True

4
ee/cli/templates/virtualconf.mustache

@ -27,8 +27,8 @@ server {
} }
{{/static}} {{/static}}
{{^static}}include{{/static}} {{^hhvm}}{{#basic}}common/php.conf;{{/basic}}{{#w3tc}}common/w3tc.conf;{{/w3tc}}{{#wpfc}}common/wpfc.conf;{{/wpfc}} {{#wpsc}}common/wpsc.conf;{{/wpsc}} {{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}} {{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}} {{/hhvm}} {{^static}}include {{^hhvm}}{{#basic}}common/php.conf;{{/basic}}{{#w3tc}}common/w3tc.conf;{{/w3tc}}{{#wpfc}}common/wpfc.conf;{{/wpfc}} {{#wpsc}}common/wpsc.conf;{{/wpsc}} {{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}} {{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}} {{/hhvm}}
{{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}} {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}}
{{#wp}}include common/wpcommon.conf;{{/wp}} {{#wp}}include common/wpcommon.conf;{{/wp}}
include common/locations.conf; include common/locations.conf;
{{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}} {{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}}

Loading…
Cancel
Save