From f4a3e2700c55ecebf1f091f7915ba64514b39e82 Mon Sep 17 00:00:00 2001
From: mbussolotto <michele.bussolotto@suse.com>
Date: Sat, 21 Oct 2023 13:52:54 +0200
Subject: [PATCH] Update zz-spacewalk-www.conf

---
 .../etc/httpd/conf.d/zz-spacewalk-www.conf    | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index ede4f8a087b8..5b8c27e44829 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -3,6 +3,24 @@ Logformat "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \
 
 DocumentRoot "/usr/share/susemanager/www/htdocs"
 
+<Directory "/usr/share/susemanager/www/htdocs">
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    <IfVersion <= 2.2>
+        Order allow,deny
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
+
+    ExpiresActive On
+    <FilesMatch "\.(js|css|ico|gif|png|pdf)$">
+      ExpiresDefault A86400
+      Header append Cache-Control "public"
+    </FilesMatch>
+</Directory>
+
 Alias /icons/ "/usr/share/apache2/icons/"
 
 <Directory "/usr/share/apache2/icons">
@@ -31,23 +49,6 @@ ScriptAlias /cgi-bin/ "/usr/share/susemanager/www/cgi-bin/"
         </IfModule>
 </Directory>
 
-<Directory "/usr/share/susemanager/www/htdocs">
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    <IfVersion <= 2.2>
-        Order allow,deny
-        Allow from all
-    </IfVersion>
-    <IfVersion >= 2.4>
-        Require all granted
-    </IfVersion>
-
-    ExpiresActive On
-    <FilesMatch "\.(js|css|ico|gif|png|pdf)$">
-      ExpiresDefault A86400
-      Header append Cache-Control "public"
-    </FilesMatch>
-</Directory>
 
 # generic html; no session for vulnerability bots
 ErrorDocument 404 /rhn/errors/404.jsp