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

Add igbinary to php_extra

Browse Source
This commit is contained in:
VirtuBox
2019-12-04 19:25:56 +01:00
parent 9a04a0d786
commit 6f6c22067e
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,10 +184,8 @@ class WOStackController(CementBaseController):
if pargs.php72: if pargs.php72:
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 + WOVar.wo_php72 apt_packages = (apt_packages + WOVar.wo_php72 +
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or WOVar.wo_php_extra)
WOAptGet.is_installed(self, 'php7.4-fpm')):
apt_packages = apt_packages + WOVar.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")
@@ -196,10 +194,8 @@ class WOStackController(CementBaseController):
if pargs.php73: if pargs.php73:
Log.debug(self, "Setting apt_packages variable for PHP 7.3") Log.debug(self, "Setting apt_packages variable for PHP 7.3")
if not WOAptGet.is_installed(self, 'php7.3-fpm'): if not WOAptGet.is_installed(self, 'php7.3-fpm'):
apt_packages = apt_packages + WOVar.wo_php73 apt_packages = (apt_packages + WOVar.wo_php73 +
if not (WOAptGet.is_installed(self, 'php7.2-fpm') or WOVar.wo_php_extra)
WOAptGet.is_installed(self, 'php7.4-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else: else:
Log.debug(self, "PHP 7.3 already installed") Log.debug(self, "PHP 7.3 already installed")
Log.info(self, "PHP 7.3 already installed") Log.info(self, "PHP 7.3 already installed")
@@ -208,10 +204,8 @@ class WOStackController(CementBaseController):
if pargs.php74: if pargs.php74:
Log.debug(self, "Setting apt_packages variable for PHP 7.4") Log.debug(self, "Setting apt_packages variable for PHP 7.4")
if not WOAptGet.is_installed(self, 'php7.4-fpm'): if not WOAptGet.is_installed(self, 'php7.4-fpm'):
apt_packages = apt_packages + WOVar.wo_php74 apt_packages = (apt_packages + WOVar.wo_php74 +
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or WOVar.wo_php_extra)
WOAptGet.is_installed(self, 'php7.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else: else:
Log.debug(self, "PHP 7.4 already installed") Log.debug(self, "PHP 7.4 already installed")
Log.info(self, "PHP 7.4 already installed") Log.info(self, "PHP 7.4 already installed")

2
wo/core/variables.py
View File

@@ -150,7 +150,7 @@ class WOVar():
for module in wo_module: for module in wo_module:
wo_php74 = wo_php74 + ["php7.4-{0}".format(module)] wo_php74 = wo_php74 + ["php7.4-{0}".format(module)]
wo_php_extra = ["php-memcached", "php-imagick", wo_php_extra = ["php-memcached", "php-imagick", "php-igbinary",
"graphviz", "php-xdebug", "php-msgpack", "php-redis"] "graphviz", "php-xdebug", "php-msgpack", "php-redis"]
wo_mysql = ["mariadb-server", "percona-toolkit"] wo_mysql = ["mariadb-server", "percona-toolkit"]