apache.conf: merge changes from upgrade to Debian 8

diff --git a/config/debian/apache.conf-api b/config/debian/apache.conf-api
index 6333fd8c81822f38c81ef5a85e50809925e03ec9..cff9df6a44c35d07021bf16276d90cbc39533905 100644 (file)
--- a/config/debian/apache.conf-api
+++ b/config/debian/apache.conf-api
@@ -10,6 +10,11 @@
   </IfModule>
   DocumentRoot /srv/ftp-master.debian.org/export
 
+  <Directory /srv/ftp-master.debian.org/dak/dakweb>
+    <Files dakweb.wsgi>
+      Require all granted
+    </Files>
+  </Directory>
   WSGIDaemonProcess api.ftp-master.debian.org user=dak-web group=dak-web processes=1 threads=5
   WSGIScriptAlias / /srv/ftp-master.debian.org/dak/dakweb/dakweb.wsgi
 </Macro>

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index 3f40a451a390c205e9663ee4e07728f5fd329cb7..72a73b9aa33a4fa1594427781a8f8d007898d411 100644 (file)
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -16,13 +16,13 @@ Use common-debian-service-https-redirect * ftp-master.debian.org
   Alias /users/ /srv/ftp.debian.org/web-users/
 
   <Directory /srv/ftp.debian.org/web-users>
-    Order allow,deny
-    Allow from All
+    Require all granted
     AllowOverride FileInfo AuthConfig Limit Indexes
     Options MultiViews Indexes SymLinksIfOwnerMatch
   </Directory>
 
   <Directory /srv/ftp.debian.org/web>
+    Require all granted
     AddCharset utf-8 .txt
   </Directory>