From aefc7718160cfd7af3620c274392ffce3d18fd5c Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Thu, 2 Jan 2014 16:25:52 +0100 Subject: [PATCH] Update apache.conf-ftp with current live version. --- config/debian/apache.conf-ftp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 + 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/ @@ -24,3 +28,4 @@ RewriteEngine On RewriteRule ^/~(.+) /users/$1 [R=permanent,L] + -- 2.39.5