Merge pull request #153 from Mermouy/mermouy

Modified the config nginx templates files to use relative path

etc/bash_completion.d/ee

@@ -33,7 +33,7 @@ EEAUTO()
 			;;
 
 		site)
-			COMPREPLY=( $( compgen -W "list show info create enable disable delete" -- $CURRENT ) )
+			COMPREPLY=( $( compgen -W "list show info create enable disable delete edit" -- $CURRENT ) )
 			return 0
 			;;
 
@@ -54,6 +54,13 @@ EEAUTO()
 			fi
 			return 0
 			;;
+		edit)
+			if [ "$EECOMMON" = "site" ]
+			then
+				COMPREPLY=( $( compgen -W '$(command find /etc/nginx/sites-available/ -type f -printf "%P " 2>/dev/null)' -- $CURRENT ) )
+			fi
+			return 0
+			;;
 
 		disable)
 			COMPREPLY=( $( compgen -W '$(command find /etc/nginx/sites-enabled/ -type l -printf "%P " 2>/dev/null)' -- $CURRENT ) )

usr/local/sbin/easyengine

@@ -844,6 +844,13 @@ EESITEINFO()
 	echo -e "\033[34m$DOMAIN Database:\t\t \033[37m$WPDBNAME\e[0m"
 }
 
+EESITEEDIT()
+{
+	# Run default editor on /etc/nginx/sites-available/$DOMAIN
+	sensible-editor /etc/nginx/sites-available/$DOMAIN
+	echo -e "\033[34VirtualHost updated..\e[0m"
+}
+
 NGINXBUCKETSIZE()
 {
 	nginx -t 2>&1 | grep server_names_hash_bucket_size &>> $INSTALLLOG
@@ -884,7 +891,7 @@ PHPRESTART()
 
 
 
-# EE Domian Functions
+# EE Domain Functions
 EESITENAME()
 {
 	# Check SITENAME Is Empty Or Not
@@ -2186,9 +2193,28 @@ then
 			EEGITDIR=/etc/nginx
 			EEGITMESSAGE="Delete Website With $SITEDELETEARG Option: $DOMAIN"
 			EEGITCOMMIT
-
 		fi
 
+	elif [ "$2" = "edit" ]
+        then
+
+                # Check SITENAME Is Empty Or Not
+                SITENAMECHECK=$3
+                EESITENAME
+
+                # Run editor
+                EESITEEDIT
+
+                # Reload Nginx Configuration
+                NGINXRELOAD
+
+                # Take Nginx Configuration In Git Version Control
+                EEGITDIR=/etc/nginx
+                EEGITMESSAGE="Edited Website: $DOMAIN"
+                EEGITCOMMIT
+
+	fi
+
 	else
 		echo -e "\033[34mList Of Available Commands:\e[0m"
 		echo -e "\tinfo:\t Dispaly Information About Given Website"
@@ -2197,9 +2223,9 @@ then
 		echo -e "\tcreate:\t Create A New HTML PHP MySQL & WordPress Website"
 		echo -e "\tdelete:\t Delete Existing Website"
 		echo -e "\tenable:\t Enable Website"
-		echo -e "\tdisable: Disable Website"
-	fi
+		echo -e "\tedit: Manually Edit Website"
 
+	fi
 
 elif [ "$1" = "update" ]
 then

usr/share/easyengine/nginx/html/basic.conf

@@ -13,6 +13,6 @@ server {
 		try_files $uri $uri/ /index.html; 
 	}
 
-	include /etc/nginx/common/locations.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/mysql/basic.conf

@@ -19,6 +19,6 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/locations.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/php/basic.conf

@@ -19,6 +19,6 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/locations.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wp/basic.conf

@@ -19,7 +19,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wp/w3tc.conf

@@ -45,7 +45,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wp/wpfc.conf

@@ -54,6 +54,6 @@ server {
 		fastcgi_cache_purge WORDPRESS "$scheme$request_method$host$1";
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 }

usr/share/easyengine/nginx/wp/wpsc.conf

@@ -41,6 +41,6 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 }

usr/share/easyengine/nginx/wpsubdir/basic.conf

@@ -37,7 +37,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wpsubdir/w3tc.conf

@@ -63,7 +63,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wpsubdir/wpfc.conf

@@ -72,6 +72,6 @@ server {
 		fastcgi_cache_purge WORDPRESS "$scheme$request_method$host$1";
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 }

usr/share/easyengine/nginx/wpsubdir/wpsc.conf

@@ -59,7 +59,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wpsubdomain/basic.conf

@@ -25,7 +25,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wpsubdomain/w3tc.conf

@@ -51,7 +51,7 @@ server {
 		fastcgi_pass php;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }

usr/share/easyengine/nginx/wpsubdomain/wpfc.conf

@@ -60,6 +60,6 @@ server {
 		fastcgi_cache_purge WORDPRESS "$scheme$request_method$host$1";
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 }

usr/share/easyengine/nginx/wpsubdomain/wpsc.conf

@@ -50,7 +50,7 @@ server {
  		fastcgi_param SERVER_NAME $http_host;
 	}
 
-	include /etc/nginx/common/wpcommon.conf;
-	include /etc/nginx/common/locations.conf;
+	include common/wpcommon.conf;
+	include common/locations.conf;
 
 }