From: Ansgar Burchardt <ansgar@debian.org>
Date: Thu, 2 Jan 2014 15:25:52 +0000 (+0100)
Subject: Update apache.conf-ftp with current live version.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=aefc7718160cfd7af3620c274392ffce3d18fd5c;p=dak.git

Update apache.conf-ftp with current live version.
---

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>