From 65a5419f7472b72474fb128f617b5503430e38ee Mon Sep 17 00:00:00 2001
From: OSPanel <93676052+OSPanel@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:37:54 +0300
Subject: [PATCH] Update httpd.conf

---
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 .../ospanel_data/default/templates/httpd.conf | 68 -------------------
 7 files changed, 476 deletions(-)

diff --git a/modules/PHP-7.2/ospanel_data/default/templates/httpd.conf b/modules/PHP-7.2/ospanel_data/default/templates/httpd.conf
index 285c591a5..124c9a41c 100644
--- a/modules/PHP-7.2/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-7.2/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host
diff --git a/modules/PHP-7.3/ospanel_data/default/templates/httpd.conf b/modules/PHP-7.3/ospanel_data/default/templates/httpd.conf
index 285c591a5..124c9a41c 100644
--- a/modules/PHP-7.3/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-7.3/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host
diff --git a/modules/PHP-7.4/ospanel_data/default/templates/httpd.conf b/modules/PHP-7.4/ospanel_data/default/templates/httpd.conf
index 285c591a5..124c9a41c 100644
--- a/modules/PHP-7.4/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-7.4/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host
diff --git a/modules/PHP-8.0/ospanel_data/default/templates/httpd.conf b/modules/PHP-8.0/ospanel_data/default/templates/httpd.conf
index fe1aa2bc3..7b261a562 100644
--- a/modules/PHP-8.0/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-8.0/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host
diff --git a/modules/PHP-8.1/ospanel_data/default/templates/httpd.conf b/modules/PHP-8.1/ospanel_data/default/templates/httpd.conf
index fe1aa2bc3..7b261a562 100644
--- a/modules/PHP-8.1/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-8.1/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host
diff --git a/modules/PHP-8.2/ospanel_data/default/templates/httpd.conf b/modules/PHP-8.2/ospanel_data/default/templates/httpd.conf
index fe1aa2bc3..7b261a562 100644
--- a/modules/PHP-8.2/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-8.2/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host
diff --git a/modules/PHP-8.3/ospanel_data/default/templates/httpd.conf b/modules/PHP-8.3/ospanel_data/default/templates/httpd.conf
index fe1aa2bc3..7b261a562 100644
--- a/modules/PHP-8.3/ospanel_data/default/templates/httpd.conf
+++ b/modules/PHP-8.3/ospanel_data/default/templates/httpd.conf
@@ -647,36 +647,6 @@ AddDefaultCharset           utf-8
     </VirtualHost>
 </Macro>
 
-<Macro CGI_Host $host $ip $aliases $public_dir $cgi_dir $log_format>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2c http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-</Macro>
-
 <Macro SSL_Host $host $ip $aliases $public_dir $ssl_cert_file $ssl_key_file $log_format>
     <IfModule ssl_module>
     <VirtualHost $ip>
@@ -707,42 +677,6 @@ AddDefaultCharset           utf-8
     </IfModule>
 </Macro>
 
-<Macro SSL_CGI_Host $host $ip $aliases $public_dir $cgi_dir $ssl_cert_file $ssl_key_file $log_format>
-    <IfModule ssl_module>
-    <VirtualHost $ip>
-        <Directory "$public_dir">
-            AllowOverride        All
-            Options              +Indexes +IncludesNoExec +Includes +ExecCGI
-            Require              all granted
-        </Directory>
-        <Directory "$cgi_dir">
-            AllowOverride        None
-            Options              +ExecCGI
-            Require              all granted
-        </Directory>
-        ServerName               $host
-        ServerAlias              $aliases
-        DocumentRoot             "$public_dir"
-        ScriptAlias    /cgi-bin/ "$cgi_dir/"
-        SSLEngine                on
-        SSLCertificateFile       "$ssl_cert_file"
-        SSLCertificateKeyFile    "$ssl_key_file"
-        Header always set        Access-Control-Allow-Origin "*"
-        Header always set        Referrer-Policy             "strict-origin-when-cross-origin"
-        # Header always set      Strict-Transport-Security   "max-age=94608000"
-        Header always set        Timing-Allow-Origin         "*"
-        Header always set        X-Content-Type-Options      "nosniff"
-        Header always set        X-Frame-Options             "SAMEORIGIN"
-        <IfModule http2_module>
-            Protocols            h2 http/1.1
-        </IfModule>
-        CustomLog                "{root_dir}/logs/domains/$host_apache_access.log" $log_format
-        ErrorLog                 "{root_dir}/logs/domains/$host_apache_error.log"
-        php_value      error_log "{root_dir}/logs/domains/$host_php_error.log"
-    </VirtualHost>
-    </IfModule>
-</Macro>
-
 # -----------------------------------------------------------------------------------
 # Virtual Hosts
 # -----------------------------------------------------------------------------------
@@ -752,6 +686,4 @@ AddDefaultCharset           utf-8
 UndefMacro Default_Host
 UndefMacro Default_SSL_Host
 UndefMacro Host
-UndefMacro CGI_Host
 UndefMacro SSL_Host
-UndefMacro SSL_CGI_Host