Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Almost there, don't use this yet

Browse Source
This commit is contained in:
jeroenlaylo
2018-11-30 18:54:42 +01:00
parent d8a570018a
commit 2788f3169d
5 changed files with 88 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
wo/cli/plugins/debug.py
View File

@@ -50,11 +50,11 @@ class WODebugController(CementBaseController):
action='store' or 'store_const', action='store' or 'store_const',
choices=('on', 'off'), const='on', nargs='?')), choices=('on', 'off'), const='on', nargs='?')),
(['--php7'], (['--php7'],
dict(help='start/stop debugging server PHP 7 configuration', dict(help='start/stop debugging server PHP 7.2 configuration',
action='store' or 'store_const', action='store' or 'store_const',
choices=('on', 'off'), const='on', nargs='?')), choices=('on', 'off'), const='on', nargs='?')),
(['--fpm7'], (['--fpm7'],
dict(help='start/stop debugging fastcgi 7.0 configuration', dict(help='start/stop debugging fastcgi 7.2 configuration',
action='store' or 'store_const', action='store' or 'store_const',
choices=('on', 'off'), const='on', nargs='?')), choices=('on', 'off'), const='on', nargs='?')),
(['--mysql'], (['--mysql'],
@@ -293,13 +293,13 @@ class WODebugController(CementBaseController):
if (self.app.pargs.php7 == 'on' and not self.app.pargs.site_name): if (self.app.pargs.php7 == 'on' and not self.app.pargs.site_name):
if (WOVariables.wo_platform_codename == 'wheezy' or WOVariables.wo_platform_codename == 'precise'): if (WOVariables.wo_platform_codename == 'wheezy' or WOVariables.wo_platform_codename == 'precise'):
Log.error(self,"PHP 7.0 not supported.") Log.error(self,"PHP 7.2 not supported.")
if not (WOShellExec.cmd_exec(self, "sed -n \"/upstream php7" if not (WOShellExec.cmd_exec(self, "sed -n \"/upstream php7"
"{/,/}/p \" /etc/nginx/" "{/,/}/p \" /etc/nginx/"
"conf.d/upstream.conf " "conf.d/upstream.conf "
"| grep 9170")): "| grep 9170")):
Log.info(self, "Enabling PHP 7.0 debug") Log.info(self, "Enabling PHP 7.2 debug")
# Change upstream.conf # Change upstream.conf
nc = NginxConfig() nc = NginxConfig()
@@ -338,7 +338,7 @@ class WODebugController(CementBaseController):
if WOShellExec.cmd_exec(self, " sed -n \"/upstream php7 {/,/}/p\" " if WOShellExec.cmd_exec(self, " sed -n \"/upstream php7 {/,/}/p\" "
"/etc/nginx/conf.d/upstream.conf " "/etc/nginx/conf.d/upstream.conf "
"| grep 9170"): "| grep 9170"):
Log.info(self, "Disabling PHP 7.0 debug") Log.info(self, "Disabling PHP 7.2 debug")
# Change upstream.conf # Change upstream.conf
nc = NginxConfig() nc = NginxConfig()
@@ -357,7 +357,7 @@ class WODebugController(CementBaseController):
self.trigger_php = True self.trigger_php = True
self.trigger_nginx = True self.trigger_nginx = True
else: else:
Log.info(self, "PHP 7.0 debug is already disabled") Log.info(self, "PHP 7.2 debug is already disabled")
@expose(hide=True) @expose(hide=True)
def debug_fpm7(self): def debug_fpm7(self):
@@ -366,7 +366,7 @@ class WODebugController(CementBaseController):
if (self.app.pargs.fpm7 == 'on' and not self.app.pargs.site_name): if (self.app.pargs.fpm7 == 'on' and not self.app.pargs.site_name):
if not WOShellExec.cmd_exec(self, "grep \"log_level = debug\" " if not WOShellExec.cmd_exec(self, "grep \"log_level = debug\" "
"/etc/php/7.2/fpm/php-fpm.conf"): "/etc/php/7.2/fpm/php-fpm.conf"):
Log.info(self, "Setting up PHP7.0-FPM log_level = debug") Log.info(self, "Setting up PHP7.2-FPM log_level = debug")
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read('/etc/php/7.2/fpm/php-fpm.conf') config.read('/etc/php/7.2/fpm/php-fpm.conf')
config.remove_option('global', 'include') config.remove_option('global', 'include')
@@ -374,12 +374,12 @@ class WODebugController(CementBaseController):
config['global']['include'] = '/etc/php/7.2/fpm/pool.d/*.conf' config['global']['include'] = '/etc/php/7.2/fpm/pool.d/*.conf'
with open('/etc/php/7.2/fpm/php-fpm.conf', with open('/etc/php/7.2/fpm/php-fpm.conf',
encoding='utf-8', mode='w') as configfile: encoding='utf-8', mode='w') as configfile:
Log.debug(self, "Writting php7.0-FPM configuration into " Log.debug(self, "Writing the PHP configuration into "
"/etc/php/7.2/fpm/php-fpm.conf") "/etc/php/7.2/fpm/php-fpm.conf")
config.write(configfile) config.write(configfile)
self.trigger_php = True self.trigger_php = True
else: else:
Log.info(self, "PHP7.0-FPM log_level = debug already setup") Log.info(self, "PHP7.2-FPM log_level = debug already setup")
self.msg = self.msg + ['/var/log/php/7.2/fpm.log'] self.msg = self.msg + ['/var/log/php/7.2/fpm.log']
@@ -387,7 +387,7 @@ class WODebugController(CementBaseController):
elif (self.app.pargs.fpm7 == 'off' and not self.app.pargs.site_name): elif (self.app.pargs.fpm7 == 'off' and not self.app.pargs.site_name):
if WOShellExec.cmd_exec(self, "grep \"log_level = debug\" " if WOShellExec.cmd_exec(self, "grep \"log_level = debug\" "
"/etc/php/7.2/fpm/php-fpm.conf"): "/etc/php/7.2/fpm/php-fpm.conf"):
Log.info(self, "Disabling PHP7.0-FPM log_level = debug") Log.info(self, "Disabling PHP7.2-FPM log_level = debug")
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read('/etc/php/7.2/fpm/php-fpm.conf') config.read('/etc/php/7.2/fpm/php-fpm.conf')
config.remove_option('global', 'include') config.remove_option('global', 'include')
@@ -395,12 +395,12 @@ class WODebugController(CementBaseController):
config['global']['include'] = '/etc/php/7.2/fpm/pool.d/*.conf' config['global']['include'] = '/etc/php/7.2/fpm/pool.d/*.conf'
with open('/etc/php/7.2/fpm/php-fpm.conf', with open('/etc/php/7.2/fpm/php-fpm.conf',
encoding='utf-8', mode='w') as configfile: encoding='utf-8', mode='w') as configfile:
Log.debug(self, "writting php7.0 configuration into " Log.debug(self, "Writing the php7.2 configuration into "
"/etc/php/7.2/fpm/php-fpm.conf") "/etc/php/7.2/fpm/php-fpm.conf")
config.write(configfile) config.write(configfile)
self.trigger_php = True self.trigger_php = True
else: else:
Log.info(self, "PHP7.0-FPM log_level = debug already disabled") Log.info(self, "PHP7.2-FPM log_level = debug already disabled")
@expose(hide=True) @expose(hide=True)
def debug_mysql(self): def debug_mysql(self):
@@ -628,8 +628,8 @@ class WODebugController(CementBaseController):
if WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic': if WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic':
if WOAptGet.is_installed(self,'php5.6-fpm'): if WOAptGet.is_installed(self,'php5.6-fpm'):
WOService.reload_service(self, 'php5.6-fpm') WOService.reload_service(self, 'php5.6-fpm')
if WOAptGet.is_installed(self,'php7.0-fpm'): if WOAptGet.is_installed(self,'php7.2-fpm'):
WOService.reload_service(self, 'php7.0-fpm') WOService.reload_service(self, 'php7.2-fpm')
else: else:
WOService.reload_service(self, 'php5-fpm') WOService.reload_service(self, 'php5-fpm')
self.app.close(0) self.app.close(0)
@@ -716,7 +716,7 @@ class WODebugController(CementBaseController):
self.app.pargs.nginx = 'on' self.app.pargs.nginx = 'on'
self.app.pargs.php = 'on' self.app.pargs.php = 'on'
self.app.pargs.fpm = 'on' self.app.pargs.fpm = 'on'
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic') and WOAptGet.is_installed(self,'php7.0-fpm'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic') and WOAptGet.is_installed(self,'php7.2-fpm'):
self.app.pargs.php7 = 'on' self.app.pargs.php7 = 'on'
self.app.pargs.fpm7 = 'on' self.app.pargs.fpm7 = 'on'
self.app.pargs.mysql = 'on' self.app.pargs.mysql = 'on'
@@ -728,7 +728,7 @@ class WODebugController(CementBaseController):
self.app.pargs.nginx = 'off' self.app.pargs.nginx = 'off'
self.app.pargs.php = 'off' self.app.pargs.php = 'off'
self.app.pargs.fpm = 'off' self.app.pargs.fpm = 'off'
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic') and WOAptGet.is_installed(self,'php7.0-fpm'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic') and WOAptGet.is_installed(self,'php7.2-fpm'):
self.app.pargs.php7 = 'off' self.app.pargs.php7 = 'off'
self.app.pargs.fpm7 = 'off' self.app.pargs.fpm7 = 'off'
self.app.pargs.mysql = 'off' self.app.pargs.mysql = 'off'
@@ -776,12 +776,12 @@ class WODebugController(CementBaseController):
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if WOAptGet.is_installed(self,'php5.6-fpm'): if WOAptGet.is_installed(self,'php5.6-fpm'):
WOService.restart_service(self, 'php5.6-fpm') WOService.restart_service(self, 'php5.6-fpm')
if WOAptGet.is_installed(self,'php7.0-fpm'): if WOAptGet.is_installed(self,'php7.2-fpm'):
WOService.restart_service(self, 'php7.0-fpm') WOService.restart_service(self, 'php7.2-fpm')
else: else:
WOService.restart_service(self, 'php5-fpm') WOService.restart_service(self, 'php5-fpm')
if WOVariables.wo_platform_codename == 'jessie': if WOVariables.wo_platform_codename == 'jessie':
WOService.restart_service(self, 'php7.0-fpm') WOService.restart_service(self, 'php7.2-fpm')
if len(self.msg) > 0: if len(self.msg) > 0:
if not self.app.pargs.interactive: if not self.app.pargs.interactive:

8
wo/cli/plugins/info.py
View File

@@ -140,7 +140,7 @@ class WOInfoController(CementBaseController):
@expose(hide=True) @expose(hide=True)
def info_php7(self): def info_php7(self):
"""Display PHP information""" """Display PHP information"""
version = os.popen("php7.0 -v 2>/dev/null | head -n1 | cut -d' ' -f2 |" version = os.popen("php7.2 -v 2>/dev/null | head -n1 | cut -d' ' -f2 |"
" cut -d'+' -f1 | tr -d '\n'").read " cut -d'+' -f1 | tr -d '\n'").read
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read('/etc/php/7.2/fpm/php.ini') config.read('/etc/php/7.2/fpm/php.ini')
@@ -247,7 +247,7 @@ class WOInfoController(CementBaseController):
self.app.pargs.nginx = True self.app.pargs.nginx = True
self.app.pargs.php = True self.app.pargs.php = True
self.app.pargs.mysql = True self.app.pargs.mysql = True
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
self.app.pargs.php = True self.app.pargs.php = True
if self.app.pargs.nginx: if self.app.pargs.nginx:
@@ -269,10 +269,10 @@ class WOInfoController(CementBaseController):
Log.error(self, "PHP5.6 is not installed") Log.error(self, "PHP5.6 is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
self.info_php7() self.info_php7()
else: else:
Log.error(self, "PHP 7.0 is not installed") Log.error(self, "PHP 7.2 is not installed")
if self.app.pargs.mysql: if self.app.pargs.mysql:
if WOShellExec.cmd_exec(self, "mysqladmin ping"): if WOShellExec.cmd_exec(self, "mysqladmin ping"):

30
wo/cli/plugins/site_functions.py
View File

@@ -713,33 +713,17 @@ def site_package_check(self, stype):
if not self.app.pargs.php7 and stype in ['php', 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']: if not self.app.pargs.php7 and stype in ['php', 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
Log.debug(self, "Setting apt_packages variable for PHP") Log.debug(self, "Setting apt_packages variable for PHP")
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): apt_packages = apt_packages + WOVariables.wo_php72 + WOVariables.wo_php_extra
if not WOAptGet.is_installed(self, 'php7.2-fpm'):
apt_packages = apt_packages + WOVariables.wo_php7_2 + WOVariables.wo_php_extra
else:
if not WOAptGet.is_installed(self, 'php5-fpm'):
apt_packages = apt_packages + WOVariables.wo_php
if self.app.pargs.php7 and stype in [ 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']: if self.app.pargs.php7 and stype in [ 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): 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") Log.debug(self, "Setting apt_packages variable for PHP 7.2")
if not WOAptGet.is_installed(self, 'php7.2-fpm'): if not WOAptGet.is_installed(self, 'php7.2-fpm'):
apt_packages = apt_packages + WOVariables.wo_php7_2 + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php72 + WOVariables.wo_php_extra
Log.debug(self, "Setting apt_packages variable for PHP 7.0")
if not WOAptGet.is_installed(self, 'php7.0-fpm'):
apt_packages = apt_packages + WOVariables.wo_php7_2 + WOVariables.wo_php_extra
else: else:
if WOVariables.wo_platform_codename == 'wheezy': Log.debug(self, "Setting apt_packages variable for PHP 7.2")
Log.warn(self, "PHP 7.0 not available for your system.") if not WOAptGet.is_installed(self, 'php7.2-fpm'):
Log.info(self,"Creating site with PHP 5.6") apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php5-fpm'):
Log.info(self, "Setting apt_packages variable for PHP")
Log.debug(self, "Setting apt_packages variable for PHP")
apt_packages = apt_packages + WOVariables.wo_php
else:
Log.debug(self, "Setting apt_packages variable for PHP 7.0")
if not WOAptGet.is_installed(self, 'php7.0-fpm'):
apt_packages = apt_packages + WOVariables.wo_php7_2
if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']: if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
Log.debug(self, "Setting apt_packages variable for MySQL") Log.debug(self, "Setting apt_packages variable for MySQL")
@@ -851,8 +835,8 @@ def site_package_check(self, stype):
Log.error(self,"PHP 7.0 is not supported in your Platform") Log.error(self,"PHP 7.0 is not supported in your Platform")
Log.debug(self, "Setting apt_packages variable for PHP 7.0") Log.debug(self, "Setting apt_packages variable for PHP 7.0")
if not WOAptGet.is_installed(self, 'php7.0-fpm'): if not WOAptGet.is_installed(self, 'php7.2-fpm'):
apt_packages = apt_packages + WOVariables.wo_php7_2 + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php72 + WOVariables.wo_php_extra
if os.path.isdir("/etc/nginx/common") and (not if os.path.isdir("/etc/nginx/common") and (not
os.path.isfile("/etc/nginx/common/php7.conf")): os.path.isfile("/etc/nginx/common/php7.conf")):

61
wo/cli/plugins/stack.py
View File

@@ -158,8 +158,7 @@ class WOStackController(CementBaseController):
WORepo.add_key(self, WOVariables.wo_nginx_key) WORepo.add_key(self, WOVariables.wo_nginx_key)
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if set(WOVariables.wo_php7_2).issubset(set(apt_packages)) \ if set(WOVariables.wo_php72).issubset(set(apt_packages)):
or set(WOVariables.wo_php5_6).issubset(set(apt_packages)):
Log.info(self, "Adding repository for PHP, please wait...") Log.info(self, "Adding repository for PHP, please wait...")
Log.debug(self, 'Adding ppa for PHP') Log.debug(self, 'Adding ppa for PHP')
WORepo.add(self, ppa=WOVariables.wo_php_repo) WORepo.add(self, ppa=WOVariables.wo_php_repo)
@@ -178,7 +177,7 @@ class WOStackController(CementBaseController):
WORepo.add(self, ppa=WOVariables.wo_php_repo) WORepo.add(self, ppa=WOVariables.wo_php_repo)
if WOVariables.wo_platform_codename == 'jessie': if WOVariables.wo_platform_codename == 'jessie':
if set(WOVariables.wo_php7_0).issubset(set(apt_packages)): if set(WOVariables.wo_php72).issubset(set(apt_packages)):
Log.debug(self, 'Adding repo_url of php 7.0 for debian') Log.debug(self, 'Adding repo_url of php 7.0 for debian')
WORepo.add(self, repo_url=WOVariables.wo_php_repo) WORepo.add(self, repo_url=WOVariables.wo_php_repo)
Log.debug(self, 'Adding Dotdeb/php GPG key') Log.debug(self, 'Adding Dotdeb/php GPG key')
@@ -249,7 +248,7 @@ class WOStackController(CementBaseController):
wo_nginx.close() wo_nginx.close()
data = dict(php="9000", debug="9001", hhvm="8000",php7="9070",debug7="9170", data = dict(php="9000", debug="9001", hhvm="8000",php7="9070",debug7="9170",
hhvmconf=False, php7conf= True if WOAptGet.is_installed(self,'php7.0-fpm') else False ) hhvmconf=False, php7conf= True if WOAptGet.is_installed(self,'php7.2-fpm') else False )
Log.debug(self, 'Writting the nginx configuration to ' Log.debug(self, 'Writting the nginx configuration to '
'file /etc/nginx/conf.d/upstream.conf') 'file /etc/nginx/conf.d/upstream.conf')
wo_nginx = open('/etc/nginx/conf.d/upstream.conf', wo_nginx = open('/etc/nginx/conf.d/upstream.conf',
@@ -1015,7 +1014,7 @@ class WOStackController(CementBaseController):
WOService.restart_service(self, 'php5.6-fpm') WOService.restart_service(self, 'php5.6-fpm')
#PHP7.0 configuration for debian #PHP7.0 configuration for debian
if (WOVariables.wo_platform_codename == 'jessie' ) and set(WOVariables.wo_php7_2).issubset(set(apt_packages)): if (WOVariables.wo_platform_codename == 'jessie' ) and set(WOVariables.wo_php72).issubset(set(apt_packages)):
# Create log directories # Create log directories
if not os.path.exists('/var/log/php/7.2/'): if not os.path.exists('/var/log/php/7.2/'):
Log.debug(self, 'Creating directory /var/log/php/7.2/') Log.debug(self, 'Creating directory /var/log/php/7.2/')
@@ -1037,7 +1036,7 @@ class WOStackController(CementBaseController):
config.write(configfile) config.write(configfile)
# Parse /etc/php/7.2/fpm/php-fpm.conf # Parse /etc/php/7.2/fpm/php-fpm.conf
data = dict(pid="/run/php/php7.0-fpm.pid", error_log="/var/log/php7.0-fpm.log", data = dict(pid="/run/php/php7.2-fpm.pid", error_log="/var/log/php7.2-fpm.log",
include="/etc/php/7.2/fpm/pool.d/*.conf") include="/etc/php/7.2/fpm/pool.d/*.conf")
Log.debug(self, "writting php 7.0 configuration into " Log.debug(self, "writting php 7.0 configuration into "
"/etc/php/7.2/fpm/php-fpm.conf") "/etc/php/7.2/fpm/php-fpm.conf")
@@ -1134,10 +1133,10 @@ class WOStackController(CementBaseController):
WOVariables.wo_php_user, recursive=True) WOVariables.wo_php_user, recursive=True)
WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git") WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
WOService.restart_service(self, 'php7.0-fpm') WOService.restart_service(self, 'php7.2-fpm')
#preconfiguration for php7.0 #preconfiguration for php7.2
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic') and set(WOVariables.wo_php7_2).issubset(set(apt_packages)): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic') and set(WOVariables.wo_php72).issubset(set(apt_packages)):
# Create log directories # Create log directories
if not os.path.exists('/var/log/php/7.2/'): if not os.path.exists('/var/log/php/7.2/'):
Log.debug(self, 'Creating directory /var/log/php/7.2/') Log.debug(self, 'Creating directory /var/log/php/7.2/')
@@ -1159,7 +1158,7 @@ class WOStackController(CementBaseController):
config.write(configfile) config.write(configfile)
# Parse /etc/php/7.2/fpm/php-fpm.conf # Parse /etc/php/7.2/fpm/php-fpm.conf
data = dict(pid="/run/php/php7.0-fpm.pid", error_log="/var/log/php/7.2/fpm.log", data = dict(pid="/run/php/php7.2-fpm.pid", error_log="/var/log/php/7.2/fpm.log",
include="/etc/php/7.2/fpm/pool.d/*.conf") include="/etc/php/7.2/fpm/pool.d/*.conf")
Log.debug(self, "writting php 7.0 configuration into " Log.debug(self, "writting php 7.0 configuration into "
"/etc/php/7.2/fpm/php-fpm.conf") "/etc/php/7.2/fpm/php-fpm.conf")
@@ -1256,7 +1255,7 @@ class WOStackController(CementBaseController):
WOVariables.wo_php_user, recursive=True) WOVariables.wo_php_user, recursive=True)
WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git") WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
WOService.restart_service(self, 'php7.0-fpm') WOService.restart_service(self, 'php7.2-fpm')
@@ -1548,7 +1547,7 @@ class WOStackController(CementBaseController):
Log.debug(self, "Setting apt_packages variable for PHP") Log.debug(self, "Setting apt_packages variable for PHP")
if not (WOAptGet.is_installed(self, 'php5-fpm') or WOAptGet.is_installed(self, 'php5.6-fpm')): if not (WOAptGet.is_installed(self, 'php5-fpm') or WOAptGet.is_installed(self, 'php5.6-fpm')):
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
apt_packages = apt_packages + WOVariables.wo_php7_2 + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php72 + WOVariables.wo_php_extra
else: else:
apt_packages = apt_packages + WOVariables.wo_php apt_packages = apt_packages + WOVariables.wo_php
else: else:
@@ -1558,26 +1557,24 @@ class WOStackController(CementBaseController):
#PHP 7.0 for Debian (jessie+) #PHP 7.0 for Debian (jessie+)
if self.app.pargs.php7 and WOVariables.wo_platform_distro == 'debian': if self.app.pargs.php7 and WOVariables.wo_platform_distro == 'debian':
if (WOVariables.wo_platform_codename == 'jessie'): if (WOVariables.wo_platform_codename == 'jessie'):
Log.debug(self, "Setting apt_packages variable for PHP 7.0") Log.debug(self, "Setting apt_packages variable for PHP 7.2")
if not WOAptGet.is_installed(self, 'php7.0-fpm') : if not WOAptGet.is_installed(self, 'php7.2-fpm') :
apt_packages = apt_packages + WOVariables.wo_php7_0 apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php5-fpm'): if not WOAptGet.is_installed(self, 'php5-fpm'):
apt_packages = apt_packages + WOVariables.wo_php apt_packages = apt_packages + WOVariables.wo_php
else: else:
Log.debug(self, "PHP 7.0 already installed") Log.debug(self, "PHP 7.2 already installed")
Log.info(self, "PHP 7.0 already installed") Log.info(self, "PHP 7.2 already installed")
else: else:
Log.debug(self, "PHP 7.0 Not Available for your Distribution") Log.debug(self, "PHP 7.2 Not Available for your Distribution")
Log.info(self, "PHP 7.0 Not Available for your Distribution") Log.info(self, "PHP 7.2 Not Available for your Distribution")
#PHP 7.0 for Ubuntu #PHP 7.0 for Ubuntu
if self.app.pargs.php7 and not WOVariables.wo_platform_distro == 'debian': if self.app.pargs.php7 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'): 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") Log.debug(self, "Setting apt_packages variable for PHP 7.2")
if not WOAptGet.is_installed(self, 'php7.2-fpm') : if not WOAptGet.is_installed(self, 'php7.2-fpm') :
apt_packages = apt_packages + WOVariables.wo_php7_2 + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php72 + WOVariables.wo_php_extra
if not WOAptGet.is_installed(self, 'php5.6-fpm'):
apt_packages = apt_packages + WOVariables.wo_php5_6 + WOVariables.wo_php_extra
else: else:
Log.debug(self, "PHP 7.2 already installed") Log.debug(self, "PHP 7.2 already installed")
Log.info(self, "PHP 7.2 already installed") Log.info(self, "PHP 7.2 already installed")
@@ -1785,7 +1782,7 @@ class WOStackController(CementBaseController):
if self.app.pargs.php: if self.app.pargs.php:
Log.debug(self, "Removing apt_packages variable of PHP") Log.debug(self, "Removing apt_packages variable of PHP")
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
apt_packages = apt_packages + WOVariables.wo_php7_2 apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php7.2-fpm'): if not WOAptGet.is_installed(self, 'php7.2-fpm'):
apt_packages = apt_packages + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php_extra
else: else:
@@ -1795,7 +1792,7 @@ class WOStackController(CementBaseController):
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'jessie'): if (WOVariables.wo_platform_codename == 'jessie'):
Log.debug(self, "Removing apt_packages variable of PHP 7.0") Log.debug(self, "Removing apt_packages variable of PHP 7.0")
apt_packages = apt_packages + WOVariables.wo_php7_0 apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php5-fpm'): if not WOAptGet.is_installed(self, 'php5-fpm'):
apt_packages = apt_packages + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php_extra
else: else:
@@ -1804,7 +1801,7 @@ class WOStackController(CementBaseController):
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): 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") Log.debug(self, "Removing apt_packages variable of PHP 7.0")
apt_packages = apt_packages + WOVariables.wo_php7_0 apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php5.6-fpm'): if not WOAptGet.is_installed(self, 'php5.6-fpm'):
apt_packages = apt_packages + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php_extra
else: else:
@@ -1934,30 +1931,28 @@ class WOStackController(CementBaseController):
if self.app.pargs.php: if self.app.pargs.php:
Log.debug(self, "Purge apt_packages variable PHP") Log.debug(self, "Purge apt_packages variable PHP")
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
apt_packages = apt_packages + WOVariables.wo_php5_6 apt_packages = apt_packages + WOVariables.wo_php_extra
if not WOAptGet.is_installed(self, 'php7.0-fpm'):
apt_packages = apt_packages + WOVariables.wo_php_extra
else: else:
apt_packages = apt_packages + WOVariables.wo_php apt_packages = apt_packages + WOVariables.wo_php72
#For debian --php7 #For debian --php7
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'jessie'): if (WOVariables.wo_platform_codename == 'jessie'):
Log.debug(self, "Removing apt_packages variable of PHP 7.0") Log.debug(self, "Removing apt_packages variable of PHP 7.0")
apt_packages = apt_packages + WOVariables.wo_php7_0 apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php5-fpm'): if not WOAptGet.is_installed(self, 'php5-fpm'):
apt_packages = apt_packages + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php_extra
else: else:
Log.info(self,"PHP 7.0 not supported.") Log.info(self,"PHP 7.2 not supported.")
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): 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") Log.debug(self, "Removing apt_packages variable of PHP 7.0")
apt_packages = apt_packages + WOVariables.wo_php7_0 apt_packages = apt_packages + WOVariables.wo_php72
if not WOAptGet.is_installed(self, 'php5.6-fpm'): if not WOAptGet.is_installed(self, 'php5.6-fpm'):
apt_packages = apt_packages + WOVariables.wo_php_extra apt_packages = apt_packages + WOVariables.wo_php_extra
else: else:
Log.info(self,"PHP 7.0 not supported.") Log.info(self,"PHP 7.2 not supported.")
if self.app.pargs.hhvm: if self.app.pargs.hhvm:
if WOAptGet.is_installed(self, 'hhvm'): if WOAptGet.is_installed(self, 'hhvm'):
Log.debug(self, "Purge apt_packages varible of HHVM") Log.debug(self, "Purge apt_packages varible of HHVM")

60
wo/cli/plugins/stack_services.py
View File

@@ -46,17 +46,17 @@ class WOStackStatusController(CementBaseController):
else: else:
Log.info(self, "PHP5.6-FPM is not installed") Log.info(self, "PHP5.6-FPM is not installed")
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
else: else:
Log.info(self, "Your platform does not support PHP 7") Log.info(self, "Your platform does not support PHP 7")
@@ -123,17 +123,17 @@ class WOStackStatusController(CementBaseController):
else: else:
Log.info(self, "PHP5.6-FPM is not installed") Log.info(self, "PHP5.6-FPM is not installed")
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
else: else:
Log.info(self, "Your platform does not support PHP 7") Log.info(self, "Your platform does not support PHP 7")
@@ -200,17 +200,17 @@ class WOStackStatusController(CementBaseController):
else: else:
Log.info(self, "PHP5.6-FPM is not installed") Log.info(self, "PHP5.6-FPM is not installed")
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
else: else:
Log.info(self, "Your platform does not support PHP 7") Log.info(self, "Your platform does not support PHP 7")
@@ -279,17 +279,17 @@ class WOStackStatusController(CementBaseController):
else: else:
Log.info(self, "PHP5.6-FPM is not installed") Log.info(self, "PHP5.6-FPM is not installed")
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
else: else:
Log.info(self, "Your platform does not support PHP 7") Log.info(self, "Your platform does not support PHP 7")
@@ -356,17 +356,17 @@ class WOStackStatusController(CementBaseController):
else: else:
Log.info(self, "PHP5.6-FPM is not installed") Log.info(self, "PHP5.6-FPM is not installed")
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
if self.app.pargs.php7: if self.app.pargs.php7:
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'): if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
if WOAptGet.is_installed(self, 'php7.0-fpm'): if WOAptGet.is_installed(self, 'php7.2-fpm'):
services = services + ['php7.0-fpm'] services = services + ['php7.2-fpm']
else: else:
Log.info(self, "PHP7.0-FPM is not installed") Log.info(self, "PHP7.2-FPM is not installed")
else: else:
Log.info(self, "Your platform does not support PHP 7") Log.info(self, "Your platform does not support PHP 7")