From 4b45ac0c79ea0b86930c0fa882d8f7aa88b3b86f Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 8 Dec 2019 01:36:08 +0100 Subject: [PATCH] Use WOConf in stack_pref --- wo/cli/plugins/site_functions.py | 15 +++------------ wo/cli/plugins/stack_pref.py | 29 +---------------------------- wo/core/stackconf.py | 4 ++-- 3 files changed, 6 insertions(+), 42 deletions(-) diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index b61f6fc..dbf86f1 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -891,28 +891,19 @@ def site_package_check(self, stype): 'wpsubdomain']): Log.debug(self, "Setting apt_packages variable for PHP 7.2") if not (WOAptGet.is_installed(self, 'php7.2-fpm')): - apt_packages = apt_packages + WOVar.wo_php72 - if not (WOAptGet.is_installed(self, 'php7.3-fpm') or - WOAptGet.is_installed(self, 'php7.4-fpm')): - apt_packages = apt_packages + WOVar.wo_php_extra + apt_packages = apt_packages + WOVar.wo_php72 + WOVar.wo_php_extra if pargs.php73 and stype in ['php73', 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']: Log.debug(self, "Setting apt_packages variable for PHP 7.3") if not WOAptGet.is_installed(self, 'php7.3-fpm'): - apt_packages = apt_packages + WOVar.wo_php73 - if not (WOAptGet.is_installed(self, 'php7.2-fpm') or - WOAptGet.is_installed(self, 'php7.4-fpm')): - apt_packages = apt_packages + WOVar.wo_php_extra + apt_packages = apt_packages + WOVar.wo_php73 + WOVar.wo_php_extra if pargs.php74 and stype in ['php74', 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']: Log.debug(self, "Setting apt_packages variable for PHP 7.4") if not WOAptGet.is_installed(self, 'php7.4-fpm'): - apt_packages = apt_packages + WOVar.wo_php74 - if not (WOAptGet.is_installed(self, 'php7.3-fpm') or - WOAptGet.is_installed(self, 'php7.2-fpm')): - apt_packages = apt_packages + WOVar.wo_php_extra + apt_packages = apt_packages + WOVar.wo_php74 + WOVar.wo_php_extra if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']: Log.debug(self, "Setting apt_packages variable for MySQL") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index ddb6636..6af61d1 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -249,34 +249,7 @@ def post_pref(self, apt_packages, packages, upgrade=False): for wo_php in wo_php_version: data = dict(upstream="{0}".format(wo_php), release=WOVar.wo_version) - WOTemplate.deploy(self, - '{0}/{1}.conf' - .format(ngxcom, wo_php), - 'php.mustache', data) - - WOTemplate.deploy( - self, '{0}/redis-{1}.conf'.format(ngxcom, wo_php), - 'redis.mustache', data) - - WOTemplate.deploy( - self, '{0}/wpcommon-{1}.conf'.format(ngxcom, wo_php), - 'wpcommon.mustache', data) - - WOTemplate.deploy( - self, '{0}/wpfc-{1}.conf'.format(ngxcom, wo_php), - 'wpfc.mustache', data) - - WOTemplate.deploy( - self, '{0}/wpsc-{1}.conf'.format(ngxcom, wo_php), - 'wpsc.mustache', data) - - WOTemplate.deploy( - self, '{0}/wprocket-{1}.conf'.format(ngxcom, wo_php), - 'wprocket.mustache', data) - - WOTemplate.deploy( - self, '{0}/wpce-{1}.conf'.format(ngxcom, wo_php), - 'wpce.mustache', data) + WOConf.nginxcommon(self) except CommandExecutionError as e: Log.debug(self, "{0}".format(e)) diff --git a/wo/core/stackconf.py b/wo/core/stackconf.py index dd0d5c7..bd8b25c 100644 --- a/wo/core/stackconf.py +++ b/wo/core/stackconf.py @@ -14,9 +14,9 @@ class WOConf(): """nginx common configuration deployment""" wo_php_version = ["php72", "php73", "php74"] ngxcom = '/etc/nginx/common' + if not os.path.exists(ngxcom): + os.mkdir(ngxcom) for wo_php in wo_php_version: - if not os.path.exists(ngxcom): - os.mkdir(ngxcom) Log.debug(self, 'deploying templates for {0}'.format(wo_php)) data = dict(upstream="{0}".format(wo_php), release=WOVar.wo_version)