diff --git a/ee/cli/plugins/stack_upgrade.py b/ee/cli/plugins/stack_upgrade.py index 4c9eac0a..3743a11f 100644 --- a/ee/cli/plugins/stack_upgrade.py +++ b/ee/cli/plugins/stack_upgrade.py @@ -165,7 +165,7 @@ class EEStackUpgradeController(CementBaseController): if EEAptGet.is_installed(self, 'mariadb-server'): apt_packages = apt_packages + EEVariables.ee_mysql else: - Log.info(self, "MySQL is not installed") + Log.info(self, "MariaDB is not installed") if self.app.pargs.postfix: if EEAptGet.is_installed(self, 'postfix'): @@ -188,6 +188,31 @@ class EEStackUpgradeController(CementBaseController): EEAptGet.install(self, apt_packages) Log.info(self, "Successfully updated packages") + # Post Actions after package updates + if set(EEVariables.ee_nginx).issubset(set(apt_packages)): + # Fix whitescreen of death beacuse of missing value + # fastcgi_param SCRIPT_FILENAME $request_filename; in file + # /etc/nginx/fastcgi_params + 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') + + EEService.restart_service(self, 'nginx') + + if set(EEVariables.ee_php).issubset(set(apt_packages)): + EEService.restart_service(self, 'php') + if set(EEVariables.ee_hhvm).issubset(set(apt_packages)): + EEService.restart_service(self, 'hhvm') + if set(EEVariables.ee_postfix).issubset(set(apt_packages)): + EEService.restart_service(self, 'postfix') + if set(EEVariables.ee_mysql).issubset(set(apt_packages)): + EEService.restart_service(self, 'hhvm') + if set(EEVariables.ee_mail).issubset(set(apt_packages)): + EEService.restart_service(self, 'dovecot') + # PHP 5.6 to 5.6 elif (self.app.pargs.php56): self.upgrade_php56() diff --git a/install b/install index ebb72806..f95c86f4 100644 --- a/install +++ b/install @@ -320,6 +320,14 @@ function ee_update_latest() echo -e "upstream hhvm {\n# HHVM Pool\nserver 127.0.0.1:8000;\nserver 127.0.0.1:9000 backup;\n}\n" >> /etc/nginx/conf.d/upstream.conf fi fi + + # Fix white screen of death as SCRIPT_FILENAME is not defined into /etc/nginx/fastcgi_params + if [ -f /etc/nginx/fastcgi_params ]; then + grep -Hr SCRIPT_FILENAME /etc/nginx/fastcgi_params &>> /dev/null + if [ $? -ne 0 ]; then + echo -e "fastcgi_param \tSCRIPT_FILENAME \t\$request_filename;\n" >> /etc/nginx/fastcgi_params + fi + fi } # Do git intialisation