fix webroot in 22222

This commit is contained in:
VirtuBox
2019-03-20 04:47:00 +01:00
parent 9c693724b5
commit fa8fadcb52

View File

@@ -373,21 +373,21 @@ class WOStackController(CementBaseController):
# Nginx-Plus does not have nginx # Nginx-Plus does not have nginx
# package structure like this # package structure like this
# So creating directories # So creating directories
if (set(["nginx-plus"]).issubset(set(apt_packages)) or if (set(["nginx"]).issubset(set(apt_packages))):
set(["nginx"]).issubset(set(apt_packages))): Log.info(self,
Log.info(self, "Installing WordOpsConfigurations for" "NGINX")
"Installing WordOpsConfigurations for" "NGINX") if not os.path.exists('/etc/nginx/sites-available'):
if not os.path.exists('/etc/nginx/sites-available'): Log.debug(self, 'Creating directory'
Log.debug(self, 'Creating directory' '/etc/nginx/sites-available')
'/etc/nginx/sites-available') os.makedirs('/etc/nginx/sites-available')
os.makedirs('/etc/nginx/sites-available')
if not os.path.exists('/etc/nginx/sites-enabled'): if not os.path.exists('/etc/nginx/sites-enabled'):
Log.debug(self, 'Creating directory' Log.debug(self, 'Creating directory'
'/etc/nginx/sites-available') '/etc/nginx/sites-available')
os.makedirs('/etc/nginx/sites-enabled') os.makedirs('/etc/nginx/sites-enabled')
# 22222 port settings # 22222 port settings
data = dict(webroot=WOVariables.wo_webroot)
Log.debug(self, 'Writting the nginx configuration to ' Log.debug(self, 'Writting the nginx configuration to '
'file /etc/nginx/sites-available/' 'file /etc/nginx/sites-available/'
'22222') '22222')
@@ -897,7 +897,7 @@ class WOStackController(CementBaseController):
Log.debug(self, "writting PHP 7.3 configuration into " Log.debug(self, "writting PHP 7.3 configuration into "
"/etc/php/7.3/fpm/pool.d/www.conf") "/etc/php/7.3/fpm/pool.d/www.conf")
config.write(configfile) config.write(configfile)
# Generate /etc/php/7.3/fpm/pool.d/www-two.conf # Generate /etc/php/7.3/fpm/pool.d/www-two.conf
WOFileUtils.copyfile(self, "/etc/php/7.3/fpm/pool.d/www.conf", WOFileUtils.copyfile(self, "/etc/php/7.3/fpm/pool.d/www.conf",
"/etc/php/7.3/fpm/pool.d/www-two.conf") "/etc/php/7.3/fpm/pool.d/www-two.conf")