Merge branch 'hotfix/v3.3.6'

9 years ago · ca2fc9e812
5 changed files with 78 additions and 72 deletions
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@ -1,3 +1,6 @@
+v 3.3.6 - Sep 4, 2015
+- Fix #611
+
 v 3.3.5 - Sep 2, 2015
 - Introduced new support of --force/-f in delete command of site
  - Removes database entry or nginx configuration of site from system
--- a/docs/ee.8
+++ b/docs/ee.8
@ -1,4 +1,4 @@
-.TH ee 8 "EasyEngine (ee) version: 3.3.5" "Aug 11,2015" "EasyEngine"
+.TH ee 8 "EasyEngine (ee) version: 3.3.6" "Sept 4,2015" "EasyEngine"
 .SH NAME
 .B EasyEngine (ee)
 \- Manage Nginx Based Websites.
@ -284,7 +284,7 @@ Install, activate, configure Nginx-helper and Redis Object Cache Plugin, Configu
 .TP
 .B --hhvm
 .br
-Install, activate Nginx-helper and configure NGINX for HHVM. 
+Install, activate Nginx-helper and configure NGINX for HHVM.
 .SH FILES
 .br
 /etc/easyengine/ee.conf
--- 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.5"
+    ee_version = "3.3.6"


    # EasyEngine packages versions
--- a/137
+++ b/137
@ -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.5"
+readonly ee_version_new="3.3.6"
 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}')
@ -302,77 +302,80 @@ function ee_update_latest()
            fi
        fi
    fi
-    ee_lib_echo "Updating Nginx configuration, please wait..."
-    # From version 3.1.10 we are using Suse builder for repository
-    if [ "$ee_distro_version" == "precise" ]; then
-        grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
-        if [[ $? -ne 0 ]]; then
-            if [ -f /etc/apt/sources.list.d/rtcamp-nginx-precise.list ]; then
-                rm -rf /etc/apt/sources.list.d/rtcamp-nginx-precise.list
-            fi
-            echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
-            gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
-            gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
-            if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
-                mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
-            fi
-            mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
-            apt-get update
-            apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom

-        fi
-    elif [ "$ee_distro_version" == "trusty" ]; then
-        grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
-        if [[ $? -ne 0 ]]; then
-            if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then
-                rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list
+    if [ -f /etc/nginx/nginx.conf ]; then
+        ee_lib_echo "Updating Nginx configuration, please wait..."
+        # From version 3.1.10 we are using Suse builder for repository
+        if [ "$ee_distro_version" == "precise" ]; then
+            grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
+            if [[ $? -ne 0 ]]; then
+                if [ -f /etc/apt/sources.list.d/rtcamp-nginx-precise.list ]; then
+                    rm -rf /etc/apt/sources.list.d/rtcamp-nginx-precise.list
+                fi
+                echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
+                gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
+                gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
+                if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
+                    mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+                fi
+                mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
+                apt-get update
+                apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
+
            fi
-            echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
-            gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
-            gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
-            if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
-                mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+        elif [ "$ee_distro_version" == "trusty" ]; then
+            grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
+            if [[ $? -ne 0 ]]; then
+                if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then
+                    rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list
+                fi
+                echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
+                gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
+                gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
+                if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
+                    mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+                fi
+                mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
+                apt-get update
+                apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
            fi
-            mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
-            apt-get update
-            apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
-        fi
-    elif [ "$ee_distro_version" == "wheezy" ]; then
-        grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
-        #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
-        if [[ $? -ne 0 ]]; then
-            # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then
-            #     rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list
-            # else
-            #     sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
-            # fi
-            echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
-            gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
-            gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
-            if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
-                mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+        elif [ "$ee_distro_version" == "wheezy" ]; then
+            grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
+            #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
+            if [[ $? -ne 0 ]]; then
+                # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then
+                #     rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list
+                # else
+                #     sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
+                # fi
+                echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
+                gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
+                gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
+                if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
+                    mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+                fi
+                mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
+                mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
+                apt-get update
+                apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
            fi
-            mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
-            mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
-            apt-get update
-            apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
-        fi
-    elif [ "$ee_distro_version" == "jessie" ]; then
-
-        grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
-        #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
-        if [[ $? -ne 0 ]]; then
-            #sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
-            echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
-            gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
-            gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
-            if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
-                mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+        elif [ "$ee_distro_version" == "jessie" ]; then
+
+            grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
+            #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
+            if [[ $? -ne 0 ]]; then
+                #sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
+                echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
+                gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
+                gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
+                if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
+                    mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
+                fi
+                mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
+                mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
+                apt-get update
+                apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
            fi
-            mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
-            mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
-            apt-get update
-            apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
        fi
    fi

--- 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.5',
+      version='3.3.6',
      description=long_description,
      long_description=long_description,
      classifiers=[],
@ -80,7 +80,7 @@ setup(name='ee',
          'python-apt',
          'pynginxconfig',
          'pymysql3 == 0.4',
-          'psutil',
+          'psutil == 3.1.1',
          'sh',
          'sqlalchemy',
          ],