X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapache.conf-ftp;h=3c8194a6192f53c667fd8e9b69a4254978310bdb;hb=773f4286615587294d6e6acfb850df53a661bbc5;hp=bda84adfa9563d998db5ee1b946ee56e6154a945;hpb=aefc7718160cfd7af3620c274392ffce3d18fd5c;p=dak.git

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index bda84adf..3c8194a6 100644
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -10,22 +10,31 @@ Use common-debian-service-https-redirect * ftp-master.debian.org
   Use common-debian-service-ssl ftp-master.debian.org
   Use common-ssl-HSTS
 
-  Redirect permanent /proposed-updates.html http://release.debian.org/proposed-updates/stable.html
-  Redirect permanent /oldstable-proposed-updates.html http://release.debian.org/proposed-updates/oldstable.html
-  Redirect permanent /testing/hints/transitions.yaml http://ftp-master.debian.org/transitions.yaml
+  Redirect permanent /proposed-updates.html https://release.debian.org/proposed-updates/stable.html
+  Redirect permanent /oldstable-proposed-updates.html https://release.debian.org/proposed-updates/oldstable.html
+  Redirect permanent /testing/hints/transitions.yaml https://ftp-master.debian.org/transitions.yaml
   Alias /users/ /srv/ftp.debian.org/web-users/
+  Alias /static/lintian.tags /srv/ftp-master.debian.org/dak/config/debian/lintian.tags
 
   <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
+    Options MultiViews Indexes SymLinksIfOwnerMatch
+  </Directory>
+
+  <Directory /srv/ftp-master.debian.org/dak/config/debian>
+    <Files lintian.tags>
+      Require all granted
+    </Files>
   </Directory>
 
   RewriteEngine On
   RewriteRule ^/~(.+) /users/$1 [R=permanent,L]
+  RewriteRule ^/testing/(.*) https://release.debian.org/britney/$1 [R=permanent,L]
 </VirtualHost>