From 42aa3d970c4dc50e1c277638c56ae7b5e9956945 Mon Sep 17 00:00:00 2001
From: Mitesh Shah <Mr.Miteshah@gmail.com>
Date: Fri, 20 Jun 2014 16:30:54 +0530
Subject: [PATCH] ee site create with --w3tc flag

---
 .travis.yml    | 16 +++++----
 bin/easyengine | 17 ++++++++--
 bin/ee         | 92 +++++++++++++++++++++++++-------------------------
 3 files changed, 70 insertions(+), 55 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9013811c..d5055572 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,17 +24,19 @@ script:
 - sudo bash bin/install.sh $TRAVIS_BRANCH
 
 - sudo ee stack install
-- sudo bash ee info
 
 - sudo bash ee site create html.com
 - sudo bash ee site create php.com --php
 - sudo bash ee site create mysql.com --mysql
-- sudo bash ee site create wp-basic.com --wp
-- sudo bash ee site create wpsubdir-basic.com --wpsubdir
-- sudo bash ee site create wpsubdomain-basic.com --wpsubdomain
+- sudo bash ee site create wpbasic.com --wp
+- sudo bash ee site create wpsubdirbasic.com --wpsubdir
+- sudo bash ee site create wpsubdomainbasic.com --wpsubdomain
+- sudo bash ee site create wpw3tc.com --w3tc
+- sudo bash ee site create wpsubdirw3tc.com --wpsubdirectory --w3tc
+- sudo bash ee site create wpsubdomainw3tc.com --w3tc --wpsubdom
+
+- sudo cat /var/log/easyengine/*
 
-- sudo bash ee site create wpsubdir-basic2.com --wpsubdirectory
-- sudo bash ee site create wpsubdomain-basic2.com --wpsubdom
 - sudo mysql -e "show databases";
 - sudo wp --allow-root --info
-- sudo cat /var/log/easyengine/*
+
diff --git a/bin/easyengine b/bin/easyengine
index d1a568ff..25c7630a 100644
--- a/bin/easyengine
+++ b/bin/easyengine
@@ -271,7 +271,7 @@ elif [ "$EE_FIRST" = "site" ]; then
 			# Display Success Message
 			ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
 		elif [ "$EE_SITE_CREATE_OPTION" = "--wp" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
-			if [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then
+			if [ "$EE_SITE_CACHE_OPTION" = "--basic" ] || [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ]; then
 				# Configure variable
 				EE_NGINX_CONF=$(echo $EE_SITE_CREATE_OPTION | cut -c3-)/basic.conf
 				echo -e "EE_DOMAIN_CHECK = $EE_DOMAIN_CHECK \nEE_SITE_CREATE_OPTION = $EE_SITE_CREATE_OPTION \nEE_SITE_CACHE_OPTION = $EE_SITE_CACHE_OPTION \nEE_NETWORK_ACTIVATE = $EE_NETWORK_ACTIVATE \nEE_WP_SUBDOMAIN = $EE_WP_SUBDOMAIN \nEE_NGINX_CONF = $EE_NGINX_CONF" &>> $EE_COMMAND_LOG
@@ -294,6 +294,10 @@ elif [ "$EE_FIRST" = "site" ]; then
 				# Install WordPress plugins
 				ee_mod_plugin_nginx_helper
 
+				if [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ]; then
+					ee_mod_plugin_w3tc
+				fi
+
 				# Adjust permission
 				ee_lib_permissions
 
@@ -306,8 +310,17 @@ elif [ "$EE_FIRST" = "site" ]; then
 				ee_lib_echo_info "WordPress Admin Password: $EE_WP_PASS"
 				echo
 
+				# Configure WordPress plugin settings
+				if [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ]; then
+					ee_lib_echo_escape "Configure W3TC:\thttp://$EE_DOMAIN/wp-admin/admin.php?page=w3tc_general"
+					ee_lib_echo_escape "Page Cache:\tDisk Enhanced"
+					ee_lib_echo_escape "Database Cache:\tMemcache"
+					ee_lib_echo_escape "Object Cache:\tMemcache"
+					ee_lib_echo_escape "Browser Cache:\tDisable"
+				fi
+
 				# Display Success Message
-				ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
+				ee_lib_echo_info "Successfully created new website: http://$EE_WWW_DOMAIN"
 			fi
 		fi
 	fi
diff --git a/bin/ee b/bin/ee
index 1c714d58..fa8fc6b7 100644
--- a/bin/ee
+++ b/bin/ee
@@ -396,8 +396,8 @@ SETUP_DOMAIN()
 # Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"()
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"()
 {
 	# Change Webroot Permission
 	ee_lib_permission
@@ -408,7 +408,7 @@ SETUP_DOMAIN()
 	ee_lib_git_commit
 }
 
-TOTALCACHENGINX()
+ee_mod_plugin_w3tc()
 {
 	# Installing W3 Total Cache
 	cd /var/www/$EE_DOMAIN/htdocs/
@@ -1055,8 +1055,8 @@ then
 			# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 			# Display Success Message
 			ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
@@ -1074,8 +1074,8 @@ then
 			# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 			# Display Success Message
 			ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
@@ -1093,8 +1093,8 @@ then
 			# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 			# Call MYSQLINFO Function For MySQL Values
 			MYSQLINFO
@@ -1127,10 +1127,10 @@ then
 				ee_mod_setup_wordpress
 				ee_mod_plugin_nginx_helper
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Display Success Message
 				echo
@@ -1154,12 +1154,12 @@ then
 				# Setup WordPress
 				ee_mod_setup_wordpress
 				ee_mod_plugin_nginx_helper
-				TOTALCACHENGINX
+				ee_mod_plugin_w3tc
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Display WordPress Plugin Configuration Message
 				echo
@@ -1194,8 +1194,8 @@ then
 				# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Display WordPress Plugin Configuration Message
 				echo
@@ -1226,12 +1226,12 @@ then
 				# Setup WordPress
 				ee_mod_setup_wordpress
 				ee_mod_plugin_nginx_helper
-				TOTALCACHENGINX
+				ee_mod_plugin_w3tc
 				# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Display WordPress Plugin Configuration Message
 				echo
@@ -1271,10 +1271,10 @@ then
 				# Setup WordPress SubDirectory Network
 				SETUPWPNETWORK
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1303,12 +1303,12 @@ then
 
 				# Setup WordPress SubDirectory Network
 				SETUPWPNETWORK
-				TOTALCACHENGINX
+				ee_mod_plugin_w3tc
 				# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1348,8 +1348,8 @@ then
 				# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1385,12 +1385,12 @@ then
 
 				# Setup WordPress SubDirectory Network
 				SETUPWPNETWORK
-				TOTALCACHENGINX
+				ee_mod_plugin_w3tc
 				# Adjust permission
 			ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1433,10 +1433,10 @@ then
 				# Setup WordPress SubDirectory Network
 				SETUPWPNETWORK
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1465,12 +1465,12 @@ then
 
 				# Setup WordPress SubDirectory Network
 				SETUPWPNETWORK
-				TOTALCACHENGINX
+				ee_mod_plugin_w3tc
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1508,10 +1508,10 @@ then
 				SETUPWPNETWORK
 				SUPERCACHENGINX
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma
@@ -1547,12 +1547,12 @@ then
 
 				# Setup WordPress SubDirectory Network
 				SETUPWPNETWORK
-				TOTALCACHENGINX
+				ee_mod_plugin_w3tc
 				# Adjust permission
-			ee_lib_permissions
+				ee_lib_permissions
 
-			# Git commit
-			ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
 
 				# Setup phpMyAdmin
 				#ln -s /var/www/22222/htdocs/db/pma /var/www/$EE_DOMAIN/htdocs/pma