X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapache.conf-ftp;h=1e7a64dc95a2413ea36826f8f55c46367904e18f;hb=9df65bfdac97c55243fed52791dd5e68736b1773;hp=fa0196155b6df1a9357a5cbf54f1056b80bddde2;hpb=904409029a6eba4cde495391a728c2a99c613052;p=dak.git

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index fa019615..1e7a64dc 100644
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -1,7 +1,32 @@
-  # 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 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>
+    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>
+
+  RewriteEngine On
+  RewriteRule ^/~(.+) /users/$1 [R=permanent,L]
+</VirtualHost>