From a3133bc5dbe05650e716a37417469fcdd1fece98 Mon Sep 17 00:00:00 2001
From: gau1991 <gaurav.astikar@rtcamp.com>
Date: Wed, 27 May 2015 12:36:16 +0530
Subject: [PATCH] Fixed small bugs

---
 ee/cli/plugins/debug.py |  5 +++++
 ee/cli/plugins/stack.py |  5 +++++
 ee/core/variables.py    |  2 +-
 install                 | 10 +++++++---
 setup.py                |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ee/cli/plugins/debug.py b/ee/cli/plugins/debug.py
index 9af9ee46..23b32da7 100644
--- a/ee/cli/plugins/debug.py
+++ b/ee/cli/plugins/debug.py
@@ -84,6 +84,11 @@ class EEDebugController(CementBaseController):
                                  .split())
             except Exception as e:
                 debug_address = ['0.0.0.0/0']
+
+            # Check if IP address is 127.0.0.1 then enable debug globally
+            if debug_address == ['127.0.0.1']:
+                debug_address = ['0.0.0.0/0']
+
             for ip_addr in debug_address:
                 if not ("debug_connection "+ip_addr in open('/etc/nginx/'
                    'nginx.conf', encoding='utf-8').read()):
diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py
index 2815d1f8..3abe266b 100644
--- a/ee/cli/plugins/stack.py
+++ b/ee/cli/plugins/stack.py
@@ -203,6 +203,11 @@ class EEStackController(CementBaseController):
 
             if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
                 if not (os.path.isfile('/etc/nginx/common/wpfc.conf')):
+                    # Change EasyEngine Version in nginx.conf file
+                    EEFileUtils.searchreplace(self, "/etc/nginx/nginx.conf",
+                                              "\"EasyEngine\"",
+                                              "\"EasyEngine {0}\""
+                                              .format(EEVariables.ee_version))
                     data = dict()
                     Log.debug(self, 'Writting the nginx configuration to '
                               'file /etc/nginx/conf.d/blockips.conf')
diff --git a/ee/core/variables.py b/ee/core/variables.py
index 0cbe3452..310abfd3 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.1.9"
+    ee_version = "3.1.10"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.19.1"
diff --git a/install b/install
index 9c9c0921..8c172935 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.1.9"
+readonly ee_version_new="3.1.10"
 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}')
@@ -312,8 +312,12 @@ function ee_update_latest()
         fi
     elif [ "$ee_distro_version" == "wheezy" ]; then
         grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
-        if [[ $? -eq 0 ]]; then
-            sed -i "/deb http://packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
+        if [ $? -eq 0 ] || [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; 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://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03'
             gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
diff --git a/setup.py b/setup.py
index b658791c..b4aeb973 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.1.9',
+      version='3.1.10',
       description=long_description,
       long_description=long_description,
       classifiers=[],