lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Handle conflict for PHP7.0 with PHP5 #651

master
Prabuddha Chakraborty 9 years ago
parent
c1c7ac2823
commit
0a52dcf7da
1 changed files with 13 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      ee/cli/plugins/stack.py

17
ee/cli/plugins/stack.py
View File

@ -712,7 +712,7 @@ class EEStackController(CementBaseController):
"'$http_host \"$request\" $status $body_bytes_sent '\n" "'$http_host \"$request\" $status $body_bytes_sent '\n"
"'\"$http_referer\" \"$http_user_agent\"';\n") "'\"$http_referer\" \"$http_user_agent\"';\n")
if set(EEVariables.ee_php).issubset(set(apt_packages)): if EEVariables.ee_platform_codename != 'trusty' and set(EEVariables.ee_php).issubset(set(apt_packages)):
# Create log directories # Create log directories
if not os.path.exists('/var/log/php5/'): if not os.path.exists('/var/log/php5/'):
Log.debug(self, 'Creating directory /var/log/php5/') Log.debug(self, 'Creating directory /var/log/php5/')
@ -2022,7 +2022,10 @@ class EEStackController(CementBaseController):
if self.app.pargs.php: if self.app.pargs.php:
Log.debug(self, "Setting apt_packages variable for PHP") Log.debug(self, "Setting apt_packages variable for PHP")
if not (EEAptGet.is_installed(self, 'php5-fpm') and EEAptGet.is_installed(self, 'php5.6-fpm')): if not (EEAptGet.is_installed(self, 'php5-fpm') and EEAptGet.is_installed(self, 'php5.6-fpm')):
apt_packages = apt_packages + EEVariables.ee_php if EEVariables.ee_platform_codename == 'trusty':
apt_packages = apt_packages + EEVariables.ee_php5_6
else:
apt_packages = apt_packages + EEVariables.ee_php
else: else:
Log.debug(self, "PHP already installed") Log.debug(self, "PHP already installed")
Log.info(self, "PHP already installed") Log.info(self, "PHP already installed")
@ -2283,7 +2286,10 @@ class EEStackController(CementBaseController):
Log.error(self,"Cannot Remove! Nginx Mainline version not found.") Log.error(self,"Cannot Remove! Nginx Mainline version not found.")
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")
apt_packages = apt_packages + EEVariables.ee_php if EEVariables.ee_platform_codename == 'trusty':
apt_packages = apt_packages + EEVariables.ee_php5_6
else:
apt_packages = apt_packages + EEVariables.ee_php
if self.app.pargs.hhvm: if self.app.pargs.hhvm:
if EEAptGet.is_installed(self, 'hhvm'): if EEAptGet.is_installed(self, 'hhvm'):
@ -2432,7 +2438,10 @@ class EEStackController(CementBaseController):
Log.error(self,"Cannot Purge! Nginx Mainline version not found.") Log.error(self,"Cannot Purge! Nginx Mainline version not found.")
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")
apt_packages = apt_packages + EEVariables.ee_php if EEVariables.ee_platform_codename == 'trusty':
apt_packages = apt_packages + EEVariables.ee_php5_6
else:
apt_packages = apt_packages + EEVariables.ee_php
if self.app.pargs.hhvm: if self.app.pargs.hhvm:
if EEAptGet.is_installed(self, 'hhvm'): if EEAptGet.is_installed(self, 'hhvm'):
Log.debug(self, "Purge apt_packages varible of HHVM") Log.debug(self, "Purge apt_packages varible of HHVM")

Write Preview
Loading…
Cancel
Save