From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 2 Jul 2019 09:34:29 +0000 (+0200)
Subject: Make redirects from the various debian.* and www.debian.{!org} pages less permanent
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bdf5eac4dbddb31151d09b4acd5ca65da145abab;p=mirror%2Fdsa-puppet.git

Make redirects from the various debian.* and debian.{!org} pages less permanent
---

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index c3ffd240c..a01cae29d 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -327,7 +327,7 @@
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
 
-   Redirect permanent / https://www.debian.org/
+   Redirect / https://www.debian.org/
 </VirtualHost>
 <VirtualHost <%= @vhost_listen_443 %> >
    Use common-www-other.d.o
@@ -335,7 +335,7 @@
    CustomLog /var/log/apache2/www-other-access.log privacyssl
    ErrorLog /var/log/apache2/www-other-error.log
 
-   Redirect permanent / https://www.debian.org/
+   Redirect / https://www.debian.org/
 
    Use common-debian-service-ssl debian.org
    Use common-ssl-HSTS