Merge branch 'mail'

Conflicts:
	CHANGELOG.txt

Author: gau1991

.travis.yml

@@ -126,6 +126,8 @@ script:
 - sudo bash ee debug
 - sudo bash ee debug --stop
 
+- sudo bash ee stack install mail
+
 - sudo cat /var/log/easyengine/*
 
 

CHANGELOG.txt

@@ -1,3 +1,11 @@
+v 2.1.0 - Sept 2, 2014
+  - Added Mail Server Package installation #65
+  - Fixed incorrect log file path during debug #299
+  - Added support for pt-query-advisor #189
+  - Fixed Firefox cross-domain fonts
+  - Fixed ee site edit command on Nano editor
+
+
 v 2.0.2 - Aug 13, 2014
   - Remote MySQL Support
 

bin/easyengine

@@ -90,7 +90,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 
 			# Display success message
 			ee_lib_echo "$EE_THIRD successfully installed"
-		elif [ "$EE_THIRD" = "" ]; then
+		elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "web" ] || [ "$EE_THIRD" = "all" ]; then
 			# Setup  NGINX/PHP repository
 			ee_mod_repo_nginx
 			ee_mod_repo_php
@@ -125,9 +125,68 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 			ee_ven_install_utils
 
 			# Display success message
-			ee_lib_echo "Successfully installed all packages"
-			ee_lib_echo "Create your first WordPress site powered by NGINX using:"
-			ee_lib_echo_info "ee site create example.com --wp"
+			if [ "$EE_THIRD" != "all" ];then
+				ee_lib_echo "Successfully installed web server packages"
+				ee_lib_echo "Create your first WordPress site powered by NGINX using:"
+				ee_lib_echo_info "ee site create example.com --wp"
+			fi
+		fi
+		# EasyEngine mail server setup
+		if [ "$EE_THIRD" = "mail" ] || [ "$EE_THIRD" = "all" ];then
+
+			# Check required Packages are installed or not
+			dpkg --get-selections | grep -v deinstall | grep nginx > /dev/null \
+			&& dpkg --get-selections | grep -v deinstall | grep php5-fpm > /dev/null \
+			&& mysqladmin ping &> /dev/null \
+			&& dpkg --get-selections | grep -v deinstall | grep postfix > /dev/null
+			if [ $? -ne 0 ];then
+				ee_lib_error "Failed to find NGINX PHP MySQL Postfix, exit status=" 1
+			fi
+
+			dpkg --get-selections | grep -v deinstall | grep dovecot-core > /dev/null
+			if [ $? -eq 0 ];then
+				ee_lib_error "Found installed Dovecot Packages server, exit status=" 1
+			fi
+
+			# Install Dovecot
+			ee_mod_install_dovecot
+
+			# Install mail scanner packages
+			ee_mod_install_mailscan
+
+			# Install ViMbAdmin
+			ee_ven_install_vimbadmin
+
+			# Install Roundcube
+			ee_ven_install_roundcube
+
+			# Configure PostFix
+			ee_mod_setup_postfix
+
+			# Configure Dovecot
+			ee_mod_setup_dovecot
+
+			# Setup Amavis
+			ee_mod_setup_mailscan
+
+			# Setup ViMbAdmin
+			ee_ven_setup_vimbadmin
+
+			# Setup Roundcube
+			ee_ven_setup_roundcube
+
+			# Setup Sieve Rules
+			ee_mod_setup_sieve
+	
+			ee_lib_service nginx postfix dovecot amavis restart
+
+			ee_lib_git /etc/nginx /etc/postfix /etc/dovecot /etc/amavis "Initialize Git"
+
+			# Display message for mail server
+			ee_lib_echo_escape "Configure ViMbAdmin:\thttps://$(hostname -f):22222/vimbadmin"
+			ee_lib_echo_escape "Security Salt:\t\t${ee_security_salt}\n"
+
+			ee_lib_echo "Successfully installed mail server packages"
 		fi
 
 	# EasyEngine remove/purge
@@ -153,7 +212,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 			elif [ "$EE_SECOND" = "purge" ];then
 				ee_lib_echo "$EE_THIRD successfully purged"
 			fi
-		elif [ "$EE_THIRD" = "" ]; then
+		elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "web" ] || [ "$EE_THIRD" = "all" ]; then
 			# Remove/Purge  NGINX/PHP/MySQL/Postfix package
 			ee_mod_remove_nginx
 			ee_mod_remove_php
@@ -171,11 +230,35 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 
 			# Display success message
 			if [ "$EE_SECOND" = "remove" ];then
-				ee_lib_echo "Successfully removed all packages"
+				ee_lib_echo "Successfully removed web packages"
+			elif [ "$EE_SECOND" = "purge" ];then
+				ee_lib_echo "Successfully purged web packages"
+			fi
+		fi
+		if [ "$EE_THIRD" = "all" ] || [ "$EE_THIRD" = "mail" ];then
+			# Remove Dovecot
+			ee_mod_remove_dovecot
+
+			# Remove Amavis
+			ee_mod_remove_mailscan
+
+			# Remove ViMbAdmin
+			ee_ven_remove_vimbadmin
+
+			# Remove Roundcube
+			ee_ven_remove_roundcube
+
+			# Execute: apt-get autoremove
+			ee_lib_autoremove
+
+			# Display success message
+			if [ "$EE_SECOND" = "remove" ];then
+				ee_lib_echo "Successfully removed mail server packages"
 			elif [ "$EE_SECOND" = "purge" ];then
-				ee_lib_echo "Successfully purged all packages"
+				ee_lib_echo "Successfully purged mail server packages"
 			fi
 		fi
+
 	elif [ "$EE_SECOND" = "status" ]; then
 		ee_mod_stack_status
 	elif [ "$EE_SECOND" = "start" ] || [ "$EE_SECOND" = "stop" ] || [ "$EE_SECOND" = "reload" ] || [ "$EE_SECOND" = "restart" ]; then
@@ -201,7 +284,7 @@ elif [ "$EE_FIRST" = "site" ]; then
 			|| ee_lib_error "Unable to display list of sites-available websites, exit status = " $?
 		else
 			ee_lib_echo "List of sites-enabled websites:"
-			ls /etc/nginx/sites-available/ \
+			ls /etc/nginx/sites-enabled/ \
 			|| ee_lib_error "Unable to display list of sites-enabled websites, exit status = " $?
 		fi
 	elif [ "$EE_SECOND" = "info" ] || [ "$EE_SECOND" = "show" ]; then

bin/install

@@ -42,6 +42,7 @@ readonly EE_LOG_DIR=/var/log/easyengine
 readonly EE_INSTALL_LOG=/var/log/easyengine/install.log
 readonly EE_ERROR_LOG=/var/log/easyengine/error.log
 readonly EE_LINUX_DISTRO=$(lsb_release -i |awk '{print $3}')
+readonly EE_DEBIAN_VERSION=$(lsb_release -sc)
 
 # Checking linux distro
 if [ "$EE_LINUX_DISTRO" != "Ubuntu" ] && [ "$EE_LINUX_DISTRO" != "Debian" ]; then
@@ -81,6 +82,27 @@ function ee_lib_package_check()
 	done
 }
 
+# Check hostname is FQDN or not. If not set it
+function ee_lib_check_fqdn()
+{
+	case $1 in
+		*.*)
+			if [ "$EE_FQDN" != "" ];then
+				echo $EE_FQDN > /etc/hostname
+				if [ "$EE_DEBIAN_VERSION" == "squeeze" ];then
+					/etc/init.d/hostname.sh start &>> $EE_INSTALL_LOG
+				else
+					service hostname restart &>> $EE_INSTALL_LOG
+				fi
+				hostname -f &>> $EE_INSTALL_LOG
+			fi
+			;;
+		*)
+			read -p "Enter hostname [FQDN]: " EE_FQDN
+			ee_lib_check_fqdn $EE_FQDN
+			;;
+	esac
+}
 
 # Pre checks to avoid later screw ups
 # Checking EasyEngine (ee) log directory
@@ -184,6 +206,8 @@ fi
 cp -a /tmp/easyengine/docs/man/ee.8 /usr/share/man/man8/ &>> $EE_INSTALL_LOG \
 || ee_lib_error "Unable to copy EasyEngine (ee) man page, exit status = " $?
 
+# Make hostname as FQDN
+ee_lib_check_fqdn $(hostname -f)
 
 # Git config settings
 GIT_USER_NAME=$(git config user.name)

bin/update

@@ -285,7 +285,7 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then
 				|| ee_lib_error "Unable to generate SSL certificate for port 22222, exit status = " $?
 
 				# Update PHP configuration
-				dpkg -l | grep php5-fpm &>> $EE_UPDATE_LOG
+				dpkg --get-selections | grep -v deinstall | grep php5-fpm &>> $EE_UPDATE_LOG
 				if [ $? -eq 0 ]; then
 					ee_lib_echo "Installing php5-xdebug package, please wait..."
 					apt-get -y install php5-xdebug \
@@ -325,7 +325,7 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then
 					|| ee_lib_error "Unable to add xdebug settings for debug pool, exit status = " $?
 				fi
 
-				dpkg -l | grep mysql-server &>> $EE_UPDATE_LOG
+				dpkg --get-selections | grep -v deinstall | grep mysql-server &>> $EE_UPDATE_LOG
 				if [ $? -eq 0 ]; then
 					ee_lib_echo "Installing percona-toolkit package, please wait..."
 					apt-get -y install percona-toolkit \
@@ -395,8 +395,11 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then
 				done
 			fi
 
+			# Make hostname as FQDN
+			ee_lib_check_fqdn $(hostname -f)
+
 			if [[ $EE_CURRENT_VERSION = 2.0.0 ]]; then
-				dpkg -l | grep php5-fpm &>> $EE_UPDATE_LOG
+				dpkg --get-selections | grep -v deinstall | grep php5-fpm &>> $EE_UPDATE_LOG
 				if [ $? -eq 0 ]; then
 
 					# WP-CLI change the installation method
@@ -414,6 +417,34 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then
 			fi
 		fi
 
+		if [[ $EE_CURRENT_VERSION < 2.1.0 ]];then
+			if [ -f /etc/nginx/sites-available/22222 ];then
+				ee_port=$(grep listen /etc/nginx/sites-available/22222 | awk '{ print $2 }')
+				cp -av /usr/share/easyengine/nginx/22222 /etc/nginx/sites-available/ &>> $EE_UPDATE_LOG
+				if [ "$EE_LINUX_DISTRO" == "Ubuntu" ];	then
+					sed -i "s/listen.*/listen $ee_port default_server ssl spdy;/" /etc/nginx/sites-available/22222 \
+					|| ee_lib_error "Unable to change EasyEngine admin port, exit status = " $?
+				elif [ "$EE_LINUX_DISTRO" == "Debian" ]; then
+					# Dotdeb nginx repository doesn't support spdy
+					sed -i "s/listen.*/listen $ee_port default_server ssl;/" /etc/nginx/sites-available/22222 \
+					|| ee_lib_error "Unable to change EasyEngine admin port, exit status = " $?
+				fi
+			fi
+			if [ -d /var/www/22222/htdocs/db/anemometer ];then
+				# Download pt-query-advisor Fixed #189
+				wget -q http://bazaar.launchpad.net/~percona-toolkit-dev/percona-toolkit/2.1/download/head:/ptquerydigest-20110624220137-or26tn4expb9ul2a-16/pt-query-digest -O /usr/bin/pt-query-advisor \
+				|| ee_lib_error "Unable to copy download pt-query-advisor, exit status = " $?
+				chmod 0755 /usr/bin/pt-query-advisor
+
+				# Enable pt-query-advisor plugin in Anemometer
+				sed -i "s/#	'query_advisor'/	'query_advisor'/" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php \
+				|| ee_lib_error "Unable to to activate pt-query-advisor plugin, exit status = " $?
+			fi
+
+			# Update EasyEngine current version
+			EE_CURRENT_VERSION="2.1.0"
+		fi
+
 		# Restart service
 		ee_lib_service nginx php5-fpm restart
 

config/bash_completion.d/ee

@@ -25,7 +25,7 @@ function EE_AUTO()
 			;;
 
 		install|remove|purge)
-			COMPREPLY=( $( compgen -W '$( cd /usr/local/lib/easyengine/modules/stack/install; find  -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null; cd /usr/local/lib/easyengine/vendor/; find  -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null)' -- $CURRENT ) )
+			COMPREPLY=( $( compgen -W '$(echo mail all web; cd /usr/local/lib/easyengine/modules/stack/install; find -maxdepth 1 -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null; cd /usr/local/lib/easyengine/vendor/; find  -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null | egrep -v "roundcube|vimbadmin" )' -- $CURRENT ) )
 			return 0
 			;;
 

config/nginx/common/locations.conf

@@ -15,6 +15,7 @@ location = /robots.txt {
 
 # Cache static files
 location ~* \.(ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|css|rss|atom|js|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf|swf)$ {
+	add_header "Access-Control-Allow-Origin" "*";
 	access_log off;
 	log_not_found off;
 	expires max;

docs/man/ee.8

@@ -5,7 +5,7 @@
 .SH SYNOPSIS
 ee [ version | help | info | stack | site | debug | update ]
 .TP
-ee stack [ install | remove | purge ] [ nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
+ee stack [ install | remove | purge ] [ --web | --mail | --all | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
 .TP
 ee stack [  status | start | stop | reload | restart ] 
 .TP
@@ -44,19 +44,19 @@ Display easyengine (ee) help.
 .TP
 .B stack 
 .TP
-.B 		install [ nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
+.B 		install [ all | web | mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
 .br
 				Install Nginx PHP5 MySQL Postfix stack Packages if not used with 
 .br
 				any options.Installs specific package if used with option.
 .TP
-.B 		remove [ nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
+.B 		remove [ all | web | mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
 .br
 				Remove Nginx PHP5 MySQL Postfix stack Packages if not used with 
 .br
 				any options. Remove specific package if used with option.
 .TP
-.B 		purge [ nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
+.B 		purge [ all | web | mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
 .br
 				Purge Nginx PHP5 MySQL Postfix stack Packages if not used with any
 .br

src/lib/ee_lib_check_fqdn.sh

@@ -0,0 +1,22 @@
+# Check Server hostname is FQDN or not
+
+function ee_lib_check_fqdn()
+{
+	case $1 in
+		*.*)
+			if [ "$EE_FQDN" != "" ];then
+				echo $EE_FQDN > /etc/hostname
+				if [ "$EE_DEBIAN_VERSION" == "squeeze" ];then
+					/etc/init.d/hostname.sh start &>> $EE_COMMAND_LOG
+				else
+					service hostname restart &>> $EE_COMMAND_LOG
+				fi
+				hostname -f &>> $EE_COMMAND_LOG
+			fi
+			;;
+		*)
+			read -p "Enter hostname [FQDN]: " EE_FQDN
+			ee_lib_check_fqdn $EE_FQDN
+			;;
+	esac
+}

src/lib/ee_lib_error.sh

@@ -2,6 +2,6 @@
 
 function ee_lib_error()
 {
-	echo "[ `date` ] $(tput setaf 1)$@$(tput sgr0)" | tee -ai $EE_ERROR_LOG
+	echo -e "[ `date` ] $(tput setaf 1)$@$(tput sgr0)" | tee -ai $EE_ERROR_LOG
 	exit $2
 }