I have attached a patch that remove some duplication in the httpd
configuration for fedora-packages.
Thanks
Clement
From 10a1a0261e7631511499bc34ff188fc9c214680e Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@xxxxxxxxxxxx>
Date: Thu, 21 Dec 2017 10:28:37 +0100
Subject: [PATCH] Cleanup packages httpd configuration file.
This commit remove the duplicated Directory configuration
and use apache 2.4 configuration syntax.
Signed-off-by: Clement Verna <cverna@xxxxxxxxxxxx>
---
roles/packages3/web/files/packages-httpd.conf | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/roles/packages3/web/files/packages-httpd.conf b/roles/packages3/web/files/packages-httpd.conf
index e5c3f39..4d255a9 100644
--- a/roles/packages3/web/files/packages-httpd.conf
+++ b/roles/packages3/web/files/packages-httpd.conf
@@ -31,14 +31,6 @@ Alias /packages/tw2/resources/tw2.jqplugins.ui/static /usr/lib/python2.7/site-pa
Alias /packages/tw2/resources/tw2.jquery/static /usr/lib/python2.7/site-packages/tw2/jquery/static
Alias /packages/tw2/resources/fedoracommunity.connectors.widgets.widgets/static /usr/lib/python2.7/site-packages/fedoracommunity/connectors/widgets/static
-<Directory /usr/share/fedoracommunity/public/images>
- Require all granted
-</Directory>
-
-<Directory /var/cache/fedoracommunity/packages/icons
- Require all granted
-</Directory>
-
<Directory /usr/lib/python2.7/site-packages/tw2/jqplugins/ui/static>
Require all granted
</Directory>
@@ -64,22 +56,8 @@ WSGIPythonOptimize 1
WSGIScriptAlias /packages /usr/share/fedoracommunity/production/apache/fedoracommunity.wsgi
-#<Location /community>
-# NSSOptions +StrictRequire
-# NSSRequireSSL
-# ErrorDocument 403 https://publictest16.fedoraproject.org/community
-#</Location>
-
<Directory /usr/share/fedoracommunity/>
- <IfModule mod_authz_core.c>
- # Apache 2.4
- Require all granted
- </IfModule>
- <IfModule !mod_authz_core.c>
- # Apache 2.2
- Order deny,allow
- Allow from all
- </IfModule>
+ Require all granted
WSGIProcessGroup fedoracommunity
</Directory>
@@ -89,5 +67,6 @@ WSGIScriptAlias /packages /usr/share/fedoracommunity/production/apache/fedoracom
# fedmenu, which will request icons for packages that
# don't necessarily have them. The UI will look weird
# unless those get magically redirected to a nice default.
+ Require all granted
ErrorDocument 404 https://apps.fedoraproject.org/packages/images/icons/package_128x128.png
</Directory>
--
1.8.3.1
_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
