Merge branch 'hotfix/v3.3.6'

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

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.

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

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.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,6 +302,8 @@ function ee_update_latest()
             fi
         fi
     fi
+
+    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
@@ -375,6 +377,7 @@ function ee_update_latest()
                 apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
             fi
         fi
+    fi
 
     if [ -f /etc/nginx/nginx.conf ]; then
         sed -i "s/.*X-Powered-By.*/\tadd_header X-Powered-By \"EasyEngine $ee_version_new\";/" /etc/nginx/nginx.conf &>> /dev/null

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',
           ],