Bug Fixes

PDowney · web-flow · commit 21263334fdf8 · 2026-03-07T05:39:16.000-05:00
diff --git a/config/etc/nginx/admin/admin.your-domain.conf b/config/etc/nginx/admin/admin.your-domain.conf
@@ -26,6 +26,7 @@ server {
   # Tools (phpMyAdmin, TinyFileManager, etc.) are in /var/www/admin/tools/
   # and accessed via location blocks below
   root /var/www/admin/control-panel;
+  index index.html index.php;
 
   # Admin Control Panel Protection
   # Adds a basic authentication prompt to the admin control panel.
@@ -48,7 +49,7 @@ server {
 
   # EngineScript Control Panel - Default Location (Landing Page)
   location / {
-    try_files $uri $uri/ /index.html =404;
+    try_files $uri $uri/ /index.html;
   }
 
   # API Endpoints for EngineScript Control Panel
@@ -65,79 +66,77 @@ server {
   # Admin Tools - Separate directory from control panel
   # Tools are stored in /var/www/admin/tools/ to prevent
   # EngineScript updates from overwriting tool configurations
+  #
+  # Uses root (not alias) so nested PHP locations resolve
+  # SCRIPT_FILENAME and try_files correctly against the tools
+  # directory without overriding the shared php-fpm.conf include.
   # ============================================================
 
   # phpMyAdmin - Database management tool
   location /phpmyadmin {
-    alias /var/www/admin/tools/phpmyadmin;
+    root /var/www/admin/tools;
     index index.php;
 
     location ~ \.php$ {
       fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      fastcgi_param SCRIPT_FILENAME $request_filename;
       include /etc/nginx/globals/php-fpm.conf;
     }
   }
 
   # TinyFileManager - File management tool
   location /tinyfilemanager {
-    alias /var/www/admin/tools/tinyfilemanager;
+    root /var/www/admin/tools;
     index tinyfilemanager.php;
 
     location ~ \.php$ {
       fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      fastcgi_param SCRIPT_FILENAME $request_filename;
       include /etc/nginx/globals/php-fpm.conf;
     }
   }
 
   # phpSysInfo - System information tool
   location /phpsysinfo {
-    alias /var/www/admin/tools/phpsysinfo;
+    root /var/www/admin/tools;
     index index.php;
 
     location ~ \.php$ {
       fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      fastcgi_param SCRIPT_FILENAME $request_filename;
       include /etc/nginx/globals/php-fpm.conf;
     }
   }
 
   # phpinfo - PHP information page
   location /phpinfo {
-    alias /var/www/admin/tools/phpinfo;
+    root /var/www/admin/tools;
     index index.php;
 
     location ~ \.php$ {
       fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      fastcgi_param SCRIPT_FILENAME $request_filename;
       include /etc/nginx/globals/php-fpm.conf;
     }
   }
 
   # Adminer - Lightweight database management tool
   location /adminer {
-    alias /var/www/admin/tools/adminer;
+    root /var/www/admin/tools;
     index index.php;
 
     location ~ \.php$ {
       fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      fastcgi_param SCRIPT_FILENAME $request_filename;
       include /etc/nginx/globals/php-fpm.conf;
     }
   }
 
   # OpCache GUI - PHP OpCache status and management
-  location /opcache-gui {
-    alias /var/www/admin/tools/opcache-gui;
-    index index.php;
-
-    location ~ \.php$ {
-      fastcgi_split_path_info ^(.+\.php)(/.+)$;
-      fastcgi_param SCRIPT_FILENAME $request_filename;
-      include /etc/nginx/globals/php-fpm.conf;
-    }
-  }
+  #location /opcache-gui {
+    #root /var/www/admin/tools;
+    #index index.php;
+
+    #location ~ \.php$ {
+      #fastcgi_split_path_info ^(.+\.php)(/.+)$;
+      #include /etc/nginx/globals/php-fpm.conf;
+    #}
+  #}
 
   # PHP processing for control panel root
   location ~ \.php$ {
diff --git a/scripts/functions/shared/enginescript-shared-vhost.sh b/scripts/functions/shared/enginescript-shared-vhost.sh
@@ -82,6 +82,12 @@ create_nginx_vhost() {
   cp -rf "/usr/local/bin/enginescript/config/etc/nginx/admin/admin.your-domain.conf" "/etc/nginx/admin/admin.${DOMAIN}.conf"
   sed -i "s|YOURDOMAIN|${DOMAIN}|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
 
+  # Verify control panel is deployed before enabling admin subdomain
+  if [[ ! -f "/var/www/admin/control-panel/index.html" ]]; then
+    echo "WARNING: Admin control panel files not found. Re-deploying..."
+    /usr/local/bin/enginescript/scripts/install/tools/frontend/admin-control-panel-install.sh
+  fi
+
   # Enable Admin Subdomain Vhost File
   if [[ "${ADMIN_SUBDOMAIN}" == "1" ]];
     then
