From 016e4e5cf1809d0fa9e1cea946388a7428cccdcf Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 21 Sep 2025 03:11:32 +0900
Subject: [PATCH] Remove option for apache < 2.4

apache 2.4 was released long time ago and is now available in recent
operating systems.

Change-Id: I89d399c28cd3907dfda9a4ee8efb73f8316d1040
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 etc/heat/httpd/heat-api-cfn.conf | 12 ++----------
 etc/heat/httpd/heat-api.conf     | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/etc/heat/httpd/heat-api-cfn.conf b/etc/heat/httpd/heat-api-cfn.conf
index 0359c80c10..02ed615758 100644
--- a/etc/heat/httpd/heat-api-cfn.conf
+++ b/etc/heat/httpd/heat-api-cfn.conf
@@ -7,9 +7,7 @@ Listen %PUBLICPORT%
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
     AllowEncodedSlashes On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
+    ErrorLogFormat "%{cu}t %M"
     ErrorLog /var/log/%APACHE_NAME%/heat_api_cfn.log
     CustomLog /var/log/%APACHE_NAME%/heat_api_cfn_access.log combined
     %SSLENGINE%
@@ -17,12 +15,6 @@ Listen %PUBLICPORT%
     %SSLKEYFILE%
 
     <Directory %HEAT_BIN_DIR%>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
+        Require all granted
     </Directory>
 </VirtualHost>
diff --git a/etc/heat/httpd/heat-api.conf b/etc/heat/httpd/heat-api.conf
index 877ad5918b..6125eb619a 100644
--- a/etc/heat/httpd/heat-api.conf
+++ b/etc/heat/httpd/heat-api.conf
@@ -7,9 +7,7 @@ Listen %PUBLICPORT%
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
     AllowEncodedSlashes On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
+    ErrorLogFormat "%{cu}t %M"
     ErrorLog /var/log/%APACHE_NAME%/heat_api.log
     CustomLog /var/log/%APACHE_NAME%/heat_api_access.log combined
     %SSLENGINE%
@@ -17,12 +15,6 @@ Listen %PUBLICPORT%
     %SSLKEYFILE%
 
     <Directory %HEAT_BIN_DIR%>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
+        Require all granted
     </Directory>
 </VirtualHost>