X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapache.conf-ftp;h=bda84adfa9563d998db5ee1b946ee56e6154a945;hb=bfdfe34b68b54ac28b8f92365e2b31b78285455a;hp=a326bb27630de461ed89866d9acdf9386fee1595;hpb=1eeb90f6bf381e10fcd8f0a04437883b443855d5;p=dak.git

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index a326bb27..bda84adf 100644
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -1,14 +1,18 @@
-  # virtualhost is defined in the file including this file.
+Use common-debian-service-https-redirect * ftp-master.debian.org
 
+<VirtualHost *:443>
   ServerName ftp-master.debian.org
   DocumentRoot /srv/ftp.debian.org/web
-  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
 
-  CustomLog               /var/log/apache2/ftp-master-access.log combined
+  CustomLog               /var/log/apache2/ftp-master-access.log privacy
   ErrorLog                /var/log/apache2/ftp-master-error.log
 
+  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
   Alias /users/ /srv/ftp.debian.org/web-users/
 
   <Directory /srv/ftp.debian.org/web-users>
@@ -24,3 +28,4 @@
 
   RewriteEngine On
   RewriteRule ^/~(.+) /users/$1 [R=permanent,L]
+</VirtualHost>