From fbe177bcb2ac84e7fdff68de5ed32f9f5c75e636 Mon Sep 17 00:00:00 2001
From: Mitesh Shah <Mitesh.Shah@rtcamp.com>
Date: Mon, 13 Jan 2014 14:53:29 +0530
Subject: [PATCH] Minor Changes

---
 usr/local/sbin/eeupdate | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/usr/local/sbin/eeupdate b/usr/local/sbin/eeupdate
index e0797a61..0ebf2c00 100644
--- a/usr/local/sbin/eeupdate
+++ b/usr/local/sbin/eeupdate
@@ -143,6 +143,8 @@ MYCNFCHECK()
 	else
 		# Turn Off Echo For Passwords
         stty -echo
+        MYSQLUSER=root
+        MYSQLHOST=localhost
         read -p "Enter The MySQL Password For root User: " MYSQLPASS
         stty echo
         echo
@@ -162,10 +164,16 @@ EE101()
 	(sed "/allow/,+2d" /usr/share/easyengine/nginx/common/acl.conf; grep -v ^# /etc/nginx/common/allowed_ip.conf ) > /etc/nginx/common/acl.conf
 	cp /usr/share/easyengine/nginx/common/locations.conf /etc/nginx/common
 	sed -i "s/fastcgi_cache_use_stale.*/fastcgi_cache_use_stale error timeout invalid_header updating http_500 http_503;\nfastcgi_cache_valid any 1h;/g" /etc/nginx/conf.d/fastcgi.conf
-	sed -i "/client_max_body_size/a \ \n\t# SSL Settings\n\tssl_session_cache shared:SSL:20m;\n\tssl_session_timeout 10m;\n\tssl_prefer_server_ciphers on;\n\tssl_ciphers HIGH:\!aNULL:\!MD5:\!kEDH;\n\n" /etc/nginx/nginx.conf
 	sed -i "s/log_format rt_cache.*/log_format rt_cache '\$remote_addr \$upstream_response_time \$upstream_cache_status [\$time_local] '/" /etc/nginx/nginx.conf
 	sed -i "s/.*\$body_bytes_sent'/\t\t'\$http_host \"\$request\" \$status \$body_bytes_sent '/" /etc/nginx/nginx.conf
 
+	# Check SSL Settings
+	grep ssl_ /etc/nginx/nginx.conf &>> $INSTALLLOG
+	if [ $? -ne 0 ]
+	then
+		sed -i "/client_max_body_size/a \ \n\t# SSL Settings\n\tssl_session_cache shared:SSL:20m;\n\tssl_session_timeout 10m;\n\tssl_prefer_server_ciphers on;\n\tssl_ciphers HIGH:\!aNULL:\!MD5:\!kEDH;\n\n" /etc/nginx/nginx.conf
+	fi
+
 	# Move PHP’s Session Storage To Memcache
 	sed -i "/extension/a \session.save_handler = memcache\nsession.save_path = \"tcp://localhost:11211\"" /etc/php5/mods-available/memcache.ini
 }
@@ -208,6 +216,7 @@ HTTPAUTH()
 
 RESTARTSERVICE()
 {
+	echo -e "\033[34mRestarting Nginx & PHP5-FPM Configuration, Please Wait...\e[0m"
 	service php5-fpm restart &>> $INSTALLLOG || OwnError "Unable To Restart PHP5-FPM After Update"
 	(nginx -t && service nginx restart) &>> $INSTALLLOG || OwnError "Unable To Restart Nginx After Update"
 }
@@ -247,7 +256,7 @@ then
 		EEUPDATE
 		
 
-		if [[ $EECURRENTVERSION = 1.0.1 ]]
+		if [[ $EECURRENTVERSION = 1.0.0 ]] || [[ $EECURRENTVERSION = 1.0.1 ]]
 		then
 			EE101
 			HTTPAUTH
@@ -266,7 +275,6 @@ then
 	GITCOMMIT
 
 	# Source EasyEngine (ee) Auto Complete To Take Effect
-	echo
 	echo -e "\033[34mFor EasyEngine (ee) Auto Completion Run Following Command\e[0m" | tee -ai $INSTALLLOG
 	echo -e "\033[37msource /etc/bash_completion.d/ee\e[0m" | tee -ai $INSTALLLOG
 	echo