diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0a6d1c86..7e8fa010 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +v 3.3.8 - Sep 9, 2015 +- # Fix White screen for NGINX PLUS users + v 3.3.7 - Sep 9, 2015 - EasyEngine + NGINX PLUS (http://docs.rtcamp.com/easyengine/nginx-plus/) diff --git a/docs/ee.8 b/docs/ee.8 index d28c45d8..7b5d0658 100644 --- a/docs/ee.8 +++ b/docs/ee.8 @@ -1,4 +1,4 @@ -.TH ee 8 "EasyEngine (ee) version: 3.3.7" "Sep 9,2015" "EasyEngine" +.TH ee 8 "EasyEngine (ee) version: 3.3.8" "Sep 10,2015" "EasyEngine" .SH NAME .B EasyEngine (ee) \- Manage Nginx Based Websites. diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 0681148e..81826efc 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -224,6 +224,15 @@ class EEStackController(CementBaseController): EEService.reload_service(self, 'postfix') if set(EEVariables.ee_nginx).issubset(set(apt_packages)): + if set(["nginx-plus"]).issubset(set(apt_packages)): + # Fix for white screen death with NGINX PLUS + if not EEFileUtils.grep(self, '/etc/nginx/fastcgi_params', + 'SCRIPT_FILENAME'): + with open('/etc/nginx/fastcgi_params', encoding='utf-8', + mode='a') as ee_nginx: + ee_nginx.write('fastcgi_param \tSCRIPT_FILENAME ' + '\t$request_filename;\n') + if not (os.path.isfile('/etc/nginx/common/wpfc.conf')): # Change EasyEngine Version in nginx.conf file EEFileUtils.searchreplace(self, "/etc/nginx/nginx.conf", diff --git a/ee/core/variables.py b/ee/core/variables.py index 7517fbc5..4c49b8f1 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -12,7 +12,7 @@ class EEVariables(): """Intialization of core variables""" # EasyEngine version - ee_version = "3.3.7" + ee_version = "3.3.8" # EasyEngine packages versions diff --git a/install b/install index ca9cd95a..7891ea36 100644 --- a/install +++ b/install @@ -48,7 +48,7 @@ fi # Define variables for later use ee_branch=$1 readonly ee_version_old="2.2.3" -readonly ee_version_new="3.3.7" +readonly ee_version_new="3.3.8" readonly ee_log_dir=/var/log/ee/ readonly ee_install_log=/var/log/ee/install.log readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}') @@ -383,6 +383,10 @@ function ee_update_latest() sed -i "s/.*X-Powered-By.*/\tadd_header X-Powered-By \"EasyEngine $ee_version_new\";/" /etc/nginx/nginx.conf &>> /dev/null fi + if [ -f /etc/nginx/conf.d/ee-plus.conf ]; then + sed -i "s/.*X-Powered-By.*/\tadd_header X-Powered-By \"EasyEngine $ee_version_new\";/" /etc/nginx/conf.d/ee-plus.conf &>> /dev/null + fi + # Disable Xdebug on old systems if and only if ee debug is off if [ -f /etc/php5/mods-available/xdebug.ini ]; then ee_debug_value=$(grep -Hr 9001 /etc/nginx/conf.d/upstream.conf | wc -l ) diff --git a/setup.py b/setup.py index 56d803af..69129392 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ except Exception as e: os.system("git config --global user.email {0}".format(ee_email)) setup(name='ee', - version='3.3.7', + version='3.3.8', description=long_description, long_description=long_description, classifiers=[],