From 458cba337289398e1a9a48ca02ce43d817a386b7 Mon Sep 17 00:00:00 2001
From: earnolmartin <earnolmartin@gmail.com>
Date: Wed, 12 Jul 2023 23:53:44 -0600
Subject: [PATCH] Updated nginx Templates for Better Matches / Alias

---
 ehcp/etc/nginx/apachetemplate_ehcp_panel.nginx   |  4 ----
 .../nginx_nonssl/apachetemplate_ehcp_panel.nginx |  4 ++--
 .../nginx_ssl/apachetemplate_ehcp_panel.nginx    | 16 ----------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/ehcp/etc/nginx/apachetemplate_ehcp_panel.nginx b/ehcp/etc/nginx/apachetemplate_ehcp_panel.nginx
index f55de6f..28c5d36 100755
--- a/ehcp/etc/nginx/apachetemplate_ehcp_panel.nginx
+++ b/ehcp/etc/nginx/apachetemplate_ehcp_panel.nginx
@@ -61,10 +61,6 @@ server {
 				   root /usr/share/;
 			}
 		}
-		
-		location /phpMyAdmin {
-		rewrite ^/* /phpmyadmin last;
-	}
 
 	location /webmail2/ {
 		root {ehcpdir}/;
diff --git a/ehcp/etc/nginx_nonssl/apachetemplate_ehcp_panel.nginx b/ehcp/etc/nginx_nonssl/apachetemplate_ehcp_panel.nginx
index d792957..f4993db 100755
--- a/ehcp/etc/nginx_nonssl/apachetemplate_ehcp_panel.nginx
+++ b/ehcp/etc/nginx_nonssl/apachetemplate_ehcp_panel.nginx
@@ -83,11 +83,11 @@ server {
 		}
 	}
 	
-	location /webmail {
+	location /webmail/ {
 		rewrite ^/* /roundcube last;
 	}
 
-	location /roundcube {
+	location /roundcube/ {
 		root /usr/share/;
 		index index.php index.html index.htm;
 		
diff --git a/ehcp/etc/nginx_ssl/apachetemplate_ehcp_panel.nginx b/ehcp/etc/nginx_ssl/apachetemplate_ehcp_panel.nginx
index 8bf468e..1d10c9b 100755
--- a/ehcp/etc/nginx_ssl/apachetemplate_ehcp_panel.nginx
+++ b/ehcp/etc/nginx_ssl/apachetemplate_ehcp_panel.nginx
@@ -137,22 +137,6 @@ server {
 		}
 	}
 	
-	location /extplorer/ {
-		root {ehcpdir}/;
-		index index.php index.html index.htm;
-		
-		location ~ ^/extplorer/(.+\.php)$ {
-			try_files $uri =404;
-			root {ehcpdir}/;
-			fastcgi_pass 127.0.0.1:9001;
-			fastcgi_index index.php;
-			fastcgi_param SCRIPT_FILENAME $request_filename;
-			fastcgi_param  PHP_ADMIN_VALUE "open_basedir=/var/www:/tmp:/usr/share:/var/www/php_sessions \n upload_tmp_dir=/tmp \n session.save_path=/var/www/php_sessions";
-			include /etc/nginx/fastcgi_params;
-			limit_req zone=one burst=5;
-		}
-	}
-	
 	# Alias
 	
 	location = /webmail2 {