From 13391afeb51bf7f5cbcda0ca523b18c7e84c3c7d Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Fri, 15 Mar 2019 19:27:36 +0100
Subject: [PATCH] prepare v3.9.4

---
 CHANGELOG.md            | 15 ++++++++++++---
 install                 | 14 +++++++-------
 wo/cli/plugins/stack.py | 21 ++++++++++-----------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1141547..022179f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,24 +4,34 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## Releases
+
+---
+
 ### v3.9.5 - [Unreleased]
 
+### v3.9.4 - 2019-03-15
+
 #### Added
 
 - Nginx module nginx_vts
-- Nginx patch dynamic_tls_records
+- Migration script from nginx-ee to nginx-wo
 
 #### Changed
 
 - Update WP-CLI version to 2.1.0
 - Update Adminer to 4.6.2
 - Update Nginx to 1.14.2
+- Update predis to v1.1.1
 - Refactored nginx.conf
 - Removed HHVM Stack
+- Removed old linux distro checks
+- Replace wo-acme-sh by acme.sh
 
 #### Fixed
 
-- Fix Nginx ssl_ciphers
+- Outdated Nginx ssl_ciphers suite
+- Debian 9 nginx build
 
 ### v3.9.3 - 2019-03-07
 
@@ -51,7 +61,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix php services management ([#12](https://github.com/WordOps/WordOps/issues/12))
 - Fix WP-CLI install
 
-
 ### v3.9.2 - 2018-11-30
 
 #### Changed
diff --git a/install b/install
index 5759192..cae8e14 100644
--- a/install
+++ b/install
@@ -7,7 +7,7 @@
 # Copyright (c) 2019 - WordOps
 # This script is licensed under M.I.T
 # -------------------------------------------------------------------------
-# Version 3.9.3 - 2019-03-14
+# Version 3.9.4 - 2019-03-15
 # -------------------------------------------------------------------------
 readonly wo_version_old="2.2.3"
 readonly wo_version_new="3.9.4"
@@ -322,7 +322,6 @@ wo_update_wp_cli()
         [ ! -f /etc/bash_completion.d/wp-completion.bash ] && {
             wget -qO /etc/bash_completion.d/wp-completion.bash https://raw.githubusercontent.com/wp-cli/wp-cli/master/utils/wp-completion.bash
         }
-        wp --allow-root cli update
     } >> /var/log/wo/install.log 2>&1
 }
 
@@ -411,6 +410,7 @@ wo_upgrade_nginx()
             # stop nginx
             service nginx stop
             # remove previous package
+            apt-mark unhold nginx-ee nginx-common nginx-custom
             apt-get -y -qq autoremove nginx-ee nginx-common nginx-custom
             # install new nginx package
             DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confnew" -y install nginx-custom nginx-wo
@@ -581,8 +581,8 @@ if [ -x /usr/local/bin/wo ]; then
         read -p "Update WordOps to $wo_version_new (y/n): " wo_ans
         if [ "$wo_ans" = "y" ] || [ "$wo_ans" = "Y" ]; then
             wo_install_dep | tee -ai $wo_install_log
-            wo_sync_db >> $EE_INSTALL_LOG 2>&1
-            secure_wo_db | tee -ai $EE_INSTALL_LOG
+            wo_sync_db >> $wo_install_log 2>&1
+            secure_wo_db | tee -ai $wo_install_log
             wo_install | tee -ai $wo_install_log
             wo_upgrade_nginx | tee -ai $wo_install_log
             wo_update_latest | tee -ai $wo_install_log
@@ -603,8 +603,8 @@ else
             read -p "Update WordOps to $wo_version_new (y/n): " wo_ans
             if [ "$wo_ans" = "y" ] || [ "$wo_ans" = "Y" ]; then
                 wo_install_dep | tee -ai $wo_install_log
-                wo_sync_db >> $EE_INSTALL_LOG 2>&1
-                secure_wo_db | tee -ai $EE_INSTALL_LOG
+                wo_sync_db >> $wo_install_log 2>&1
+                secure_wo_db | tee -ai $wo_install_log
                 wo_install | tee -ai $wo_install_log
                 wo_upgrade_nginx | tee -ai $wo_install_log
                 wo_update_latest | tee -ai $wo_install_log
@@ -632,7 +632,7 @@ else
     fi
 fi
 
-wo sync | tee -ai $WO_INSTALL_LOG
+wo sync | tee -ai $wo_install_log
 
 if [ "$migration" -eq "1" ]; then
     echo
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 0996814..6ad1a9d 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -522,17 +522,16 @@ class WOStackController(CementBaseController):
                                         out=wo_nginx)
                         wo_nginx.close()
 
-                    if (WOVariables.wo_platform_distro == 'ubuntu'):
-                        if (os.path.isfile("/etc/nginx/nginx.conf") and
-                                not os.path.isfile("/etc/nginx/common/redis-php73.conf")):
-                            data = dict()
-                            Log.debug(self, 'Writting the nginx configuration to '
-                                      'file /etc/nginx/common/redis-php73.conf')
-                            wo_nginx = open('/etc/nginx/common/redis-php73.conf',
-                                            encoding='utf-8', mode='w')
-                            self.app.render((data), 'redis-php7.mustache',
-                                            out=wo_nginx)
-                            wo_nginx.close()
+                    if (os.path.isfile("/etc/nginx/nginx.conf") and
+                            not os.path.isfile("/etc/nginx/common/redis-php73.conf")):
+                        data = dict()
+                        Log.debug(self, 'Writting the nginx configuration to '
+                                  'file /etc/nginx/common/redis-php73.conf')
+                        wo_nginx = open('/etc/nginx/common/redis-php73.conf',
+                                        encoding='utf-8', mode='w')
+                        self.app.render((data), 'redis-php7.mustache',
+                                        out=wo_nginx)
+                        wo_nginx.close()
 
                     if os.path.isfile("/etc/nginx/conf.d/upstream.conf"):
                         if not WOFileUtils.grep(self, "/etc/nginx/conf.d/"