Use more https://

[dak.git] / config / debian / apache.conf-ftp

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index 52a85528a8d67d84130973a6623e709e75ccdf47..3f40a451a390c205e9663ee4e07728f5fd329cb7 100644 (file)
--- 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 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/
 
   <Directory /srv/ftp.debian.org/web-users>
@@ -18,5 +22,10 @@
     Options MultiViews Indexes SymLinksIfOwnerMatch
   </Directory>
 
+  <Directory /srv/ftp.debian.org/web>
+    AddCharset utf-8 .txt
+  </Directory>
+
   RewriteEngine On
   RewriteRule ^/~(.+) /users/$1 [R=permanent,L]
+</VirtualHost>