From b4d30de9a6a44eaa78fb59693486e1ae02951ab7 Mon Sep 17 00:00:00 2001
From: gau1991 <gaurav.astikar@rtcamp.com>
Date: Wed, 11 Feb 2015 11:02:11 +0530
Subject: [PATCH 1/2] EasyEngine 3.0

---
 config/ee.conf | 10 +++++++++-
 docs/cs.md     | 13 -------------
 docs/ds.md     | 21 ---------------------
 3 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 docs/cs.md
 delete mode 100644 docs/ds.md

diff --git a/config/ee.conf b/config/ee.conf
index ce68b3e5..7472f571 100644
--- a/config/ee.conf
+++ b/config/ee.conf
@@ -40,22 +40,30 @@ max_files = 7
 
 [stack]
 
-ip-address = 0.0.0.0/0 1.1.1.1 2.2.2.2
+### IP address that will be used in Nginx configurations while installing
+ip-address = 127.0.0.1
 
 [mysql]
 
+### MySQL database grant host name
 grant-host = localhost
 
+### Ask for MySQL db name while site creation
 db-name = False
 
+### Ask for MySQL user name while site creation
 db-user = False
 
 [wordpress]
 
+### Ask for WordPress prefix while site creation
 prefix = False
 
+### User name for WordPress sites
 user =
 
+### Password for WordPress sites
 password =
 
+### EMail for WordPress sites
 email =
diff --git a/docs/cs.md b/docs/cs.md
deleted file mode 100644
index 42122c8c..00000000
--- a/docs/cs.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-## EasyEngine coding standard
-
- For contributing EasyEngine you must follow [PEP8](https://www.python.org/dev/peps/pep-0008) style guide.
-
-- Indentation -
-
-    4 spaces shoule be used as Indentation as mentioned in above style guide.
-
-- Class Name -
-
-
-- Function Name -
diff --git a/docs/ds.md b/docs/ds.md
deleted file mode 100644
index 60ec69c4..00000000
--- a/docs/ds.md
+++ /dev/null
@@ -1,21 +0,0 @@
-
-**EasyEngine 3.x Ditectory Structure**
-
-```
-easyengine
-|-- config
-|   `-- plugins.d
-|-- ee
-|   |-- cli
-|   |   |-- controllers
-|   |   |-- ext
-|   |   |-- plugins
-|   |   `-- templates
-|   |-- core
-|   `-- utils
-`-- tests
-    |-- cli
-    |   |-- ext
-    |   `-- plugins
-    `-- core
-```

From d966157e7db11144e16b09e27ab1444f6ab43a79 Mon Sep 17 00:00:00 2001
From: gau1991 <gaurav.astikar@rtcamp.com>
Date: Wed, 11 Feb 2015 11:32:39 +0530
Subject: [PATCH 2/2] Updated update script

---
 install | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/install b/install
index df70c14c..8f0046bd 100644
--- a/install
+++ b/install
@@ -214,28 +214,28 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
-# Check old EasyEngine is installed or not
-if [ ! -f /usr/local/sbin/easyengine ]; then
-    # Check latest EasyEngine is installed or not
-    if [ ! -f /usr/local/bin/ee ]; then
-        install_dep
-        install_ee3
-        git_init
-    else
-        ee_lib_echo_fail "EasyEngine 3 allready installed on your system"
-        exit 1
-    fi
-else
+if [ -f /usr/local/sbin/easyengine ]; then
     # Check old EasyEngine version
     ee version | grep ${old_ee_version} &>> /dev/null
     if [[ $? -ne 0 ]]; then
-        ee_lib_echo_fail "EasyEngine $old_ee_version not found on your system"
-        ee_lib_echo_fail "Please update it using command: ee update"
-        exit 1
+        ee_lib_echo "EasyEngine $old_ee_version not found on your system"
+        ee_lib_echo "Updating your EasyEngine to $old_ee_version for compability"
+        wget https://raw.githubusercontent.com/rtCamp/easyengine/old-stable/bin/update && bash update
+        if [[ $? -ne 0 ]]; then
+            ee_lib_echo_info "Unbale to update EasyEngine2 to $old_ee_version"
+            exit 1
+        fi
     fi
     install_dep
     sync_db
     install_ee3
     update_to_ee3
     git_init
+elif [ ! -f /usr/local/bin/ee ]; then
+    install_dep
+    install_ee3
+    git_init
+else
+    ee_lib_echo_fail "EasyEngine 3 allready installed on your system"
+    exit 1
 fi