From 36f6a72268c0b79815b4d66de36a1af882ac75dd Mon Sep 17 00:00:00 2001 From: jeroenlaylo Date: Fri, 30 Nov 2018 20:08:09 +0100 Subject: [PATCH] Almost there, don't use this yet --- wo/cli/plugins/debug.py | 18 +++++++-------- wo/cli/plugins/site_functions.py | 4 ++-- wo/cli/plugins/stack.py | 38 ++++++++++++++++---------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/wo/cli/plugins/debug.py b/wo/cli/plugins/debug.py index 95eb707..218bb08 100644 --- a/wo/cli/plugins/debug.py +++ b/wo/cli/plugins/debug.py @@ -49,7 +49,7 @@ class WODebugController(CementBaseController): dict(help='start/stop debugging fastcgi configuration', action='store' or 'store_const', choices=('on', 'off'), const='on', nargs='?')), - (['--php7'], + (['--php72'], dict(help='start/stop debugging server PHP 7.2 configuration', action='store' or 'store_const', choices=('on', 'off'), const='on', nargs='?')), @@ -287,26 +287,26 @@ class WODebugController(CementBaseController): Log.info(self, "PHP5-FPM log_level = debug already disabled") @expose(hide=True) - def debug_php7(self): + def debug_php72(self): """Start/Stop PHP debug""" # PHP global debug start - if (self.app.pargs.php7 == 'on' and not self.app.pargs.site_name): + if (self.app.pargs.php72 == 'on' and not self.app.pargs.site_name): if (WOVariables.wo_platform_codename == 'wheezy' or WOVariables.wo_platform_codename == 'precise'): Log.error(self,"PHP 7.2 not supported.") if not (WOShellExec.cmd_exec(self, "sed -n \"/upstream php7" "{/,/}/p \" /etc/nginx/" "conf.d/upstream.conf " - "| grep 9170")): + "| grep 9172")): Log.info(self, "Enabling PHP 7.2 debug") # Change upstream.conf nc = NginxConfig() nc.loadf('/etc/nginx/conf.d/upstream.conf') - nc.set([('upstream','php7',), 'server'], '127.0.0.1:9170') + nc.set([('upstream','php72',), 'server'], '127.0.0.1:9172') if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"): - nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:9170') + nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:9172') nc.savef('/etc/nginx/conf.d/upstream.conf') # Enable xdebug @@ -335,15 +335,15 @@ class WODebugController(CementBaseController): # PHP global debug stop elif (self.app.pargs.php7 == 'off' and not self.app.pargs.site_name): - if WOShellExec.cmd_exec(self, " sed -n \"/upstream php7 {/,/}/p\" " + if WOShellExec.cmd_exec(self, " sed -n \"/upstream php72 {/,/}/p\" " "/etc/nginx/conf.d/upstream.conf " - "| grep 9170"): + "| grep 9172"): Log.info(self, "Disabling PHP 7.2 debug") # Change upstream.conf nc = NginxConfig() nc.loadf('/etc/nginx/conf.d/upstream.conf') - nc.set([('upstream','php7',), 'server'], '127.0.0.1:9070') + nc.set([('upstream','php72',), 'server'], '127.0.0.1:9072') if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"): nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:8000') nc.savef('/etc/nginx/conf.d/upstream.conf') diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 6b28703..3fd281e 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -896,8 +896,8 @@ def site_package_check(self, stype): if not WOFileUtils.grep(self, "/etc/nginx/conf.d/upstream.conf", "php72"): with open("/etc/nginx/conf.d/upstream.conf", "a") as php_file: - php_file.write("upstream php7 {\nserver 127.0.0.1:9070;\n}\n" - "upstream debug7 {\nserver 127.0.0.1:9170;\n}\n") + php_file.write("upstream php72 {\nserver 127.0.0.1:9072;\n}\n" + "upstream debug72 {\nserver 127.0.0.1:9172;\n}\n") return(stack.install(apt_packages=apt_packages, packages=packages, disp_msg=False)) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index fd7214b..97bb621 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -243,7 +243,7 @@ class WOStackController(CementBaseController): self.app.render((data), 'fastcgi.mustache', out=wo_nginx) wo_nginx.close() - data = dict(php="9000", debug="9001", hhvm="8000",php72="9072",debug7="9170", + data = dict(php="9000", debug="9001", hhvm="8000",php72="9072",debug7="9172", hhvmconf=False, php7conf= True if WOAptGet.is_installed(self,'php7.2-fpm') else False ) Log.debug(self, 'Writting the nginx configuration to ' 'file /etc/nginx/conf.d/upstream.conf') @@ -569,7 +569,7 @@ class WOStackController(CementBaseController): "'$http_host \"$request\" $status $body_bytes_sent '\n" "'\"$http_referer\" \"$http_user_agent\"';\n") #setup nginx common folder for php7 - if self.app.pargs.php7: + if self.app.pargs.php72: if os.path.isdir("/etc/nginx/common") and (not os.path.isfile("/etc/nginx/common/php7.conf")): data = dict() @@ -627,8 +627,8 @@ class WOStackController(CementBaseController): if not WOFileUtils.grep(self, "/etc/nginx/conf.d/upstream.conf", "php72"): with open("/etc/nginx/conf.d/upstream.conf", "a") as php_file: - php_file.write("upstream php7 {\nserver 127.0.0.1:9070;\n}\n" - "upstream debug7 {\nserver 127.0.0.1:9170;\n}\n") + php_file.write("upstream php72 {\nserver 127.0.0.1:9072;\n}\n" + "upstream debug72 {\nserver 127.0.0.1:9172;\n}\n") if set(WOVariables.wo_hhvm).issubset(set(apt_packages)): @@ -1054,7 +1054,7 @@ class WOStackController(CementBaseController): config['www']['pm.max_spare_servers'] = '30' config['www']['request_terminate_timeout'] = '300' config['www']['pm'] = 'ondemand' - config['www']['listen'] = '127.0.0.1:9070' + config['www']['listen'] = '127.0.0.1:9072' with codecs.open('/etc/php/7.2/fpm/pool.d/www.conf', encoding='utf-8', mode='w') as configfile: Log.debug(self, "writting PHP5 configuration into " @@ -1068,7 +1068,7 @@ class WOStackController(CementBaseController): "debug.conf", "[www]", "[debug]") config = configparser.ConfigParser() config.read('/etc/php/7.2/fpm/pool.d/debug.conf') - config['debug']['listen'] = '127.0.0.1:9170' + config['debug']['listen'] = '127.0.0.1:9172' config['debug']['rlimit_core'] = 'unlimited' config['debug']['slowlog'] = '/var/log/php/7.2/slow.log' config['debug']['request_slowlog_timeout'] = '10s' @@ -1176,7 +1176,7 @@ class WOStackController(CementBaseController): config['www']['pm.max_spare_servers'] = '30' config['www']['request_terminate_timeout'] = '300' config['www']['pm'] = 'ondemand' - config['www']['listen'] = '127.0.0.1:9070' + config['www']['listen'] = '127.0.0.1:9072' with codecs.open('/etc/php/7.2/fpm/pool.d/www.conf', encoding='utf-8', mode='w') as configfile: Log.debug(self, "writting PHP5 configuration into " @@ -1190,7 +1190,7 @@ class WOStackController(CementBaseController): "debug.conf", "[www]", "[debug]") config = configparser.ConfigParser() config.read('/etc/php/7.2/fpm/pool.d/debug.conf') - config['debug']['listen'] = '127.0.0.1:9170' + config['debug']['listen'] = '127.0.0.1:9172' config['debug']['rlimit_core'] = 'unlimited' config['debug']['slowlog'] = '/var/log/php/7.2/slow.log' config['debug']['request_slowlog_timeout'] = '10s' @@ -1491,7 +1491,7 @@ class WOStackController(CementBaseController): (not self.app.pargs.phpmyadmin) and (not self.app.pargs.hhvm) and (not self.app.pargs.adminer) and (not self.app.pargs.utils) and (not self.app.pargs.redis) and (not self.app.pargs.phpredisadmin) and - (not self.app.pargs.php7)): + (not self.app.pargs.php72)): self.app.pargs.web = True self.app.pargs.admin = True @@ -1551,7 +1551,7 @@ class WOStackController(CementBaseController): Log.info(self, "PHP already installed") #PHP 7.0 for Debian (jessie+) - if self.app.pargs.php7 and WOVariables.wo_platform_distro == 'debian': + if self.app.pargs.php72 and WOVariables.wo_platform_distro == 'debian': if (WOVariables.wo_platform_codename == 'jessie'): Log.debug(self, "Setting apt_packages variable for PHP 7.2") if not WOAptGet.is_installed(self, 'php7.2-fpm') : @@ -1566,7 +1566,7 @@ class WOStackController(CementBaseController): Log.info(self, "PHP 7.2 Not Available for your Distribution") #PHP 7.0 for Ubuntu - if self.app.pargs.php7 and not WOVariables.wo_platform_distro == 'debian': + if self.app.pargs.php72 and not WOVariables.wo_platform_distro == 'debian': if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): Log.debug(self, "Setting apt_packages variable for PHP 7.2") if not WOAptGet.is_installed(self, 'php7.2-fpm') : @@ -1743,7 +1743,7 @@ class WOStackController(CementBaseController): if ((not self.app.pargs.web) and (not self.app.pargs.admin) and (not self.app.pargs.nginx) and (not self.app.pargs.php) and - (not self.app.pargs.php7) and (not self.app.pargs.mysql) and + (not self.app.pargs.php72) and (not self.app.pargs.mysql) and (not self.app.pargs.wpcli) and (not self.app.pargs.phpmyadmin) and (not self.app.pargs.hhvm) and (not self.app.pargs.adminer) and (not self.app.pargs.utils) and (not self.app.pargs.all) and @@ -1755,7 +1755,7 @@ class WOStackController(CementBaseController): self.app.pargs.web = True self.app.pargs.admin = True if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): - self.app.pargs.php7 = True + self.app.pargs.php72 = True if self.app.pargs.web: self.app.pargs.nginx = True @@ -1785,7 +1785,7 @@ class WOStackController(CementBaseController): apt_packages = apt_packages + WOVariables.wo_php #PHP7.0 for debian(jessie+) - if self.app.pargs.php7: + if self.app.pargs.php72: if (WOVariables.wo_platform_codename == 'jessie'): Log.debug(self, "Removing apt_packages variable of PHP 7.0") apt_packages = apt_packages + WOVariables.wo_php72 @@ -1794,7 +1794,7 @@ class WOStackController(CementBaseController): else: Log.info(self,"PHP 7.0 not supported.") - if self.app.pargs.php7: + if self.app.pargs.php72: if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): Log.debug(self, "Removing apt_packages variable of PHP 7.0") apt_packages = apt_packages + WOVariables.wo_php72 @@ -1877,7 +1877,7 @@ class WOStackController(CementBaseController): Log.info(self, "Successfully removed packages") #Added for Ondrej Repo missing package Fix - if self.app.pargs.php7: + if self.app.pargs.php72: if WOAptGet.is_installed(self, 'php5.6-fpm'): Log.info(self, "PHP5.6-fpm found on system.") Log.info(self, "Verifying and installing missing packages,") @@ -1932,7 +1932,7 @@ class WOStackController(CementBaseController): apt_packages = apt_packages + WOVariables.wo_php72 #For debian --php7 - if self.app.pargs.php7: + if self.app.pargs.php72: if (WOVariables.wo_platform_codename == 'jessie'): Log.debug(self, "Removing apt_packages variable of PHP 7.0") apt_packages = apt_packages + WOVariables.wo_php72 @@ -1941,7 +1941,7 @@ class WOStackController(CementBaseController): else: Log.info(self,"PHP 7.2 not supported.") - if self.app.pargs.php7: + if self.app.pargs.php72: if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): Log.debug(self, "Removing apt_packages variable of PHP 7.0") apt_packages = apt_packages + WOVariables.wo_php72 @@ -2019,7 +2019,7 @@ class WOStackController(CementBaseController): Log.info(self, "Successfully purged packages") #Added for php Ondrej repo missing package fix - if self.app.pargs.php7: + if self.app.pargs.php72: if WOAptGet.is_installed(self, 'php5.6-fpm'): Log.info(self, "PHP5.6-fpm found on system.") Log.info(self, "Verifying and installing missing packages,")