Move lintian to https

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 58cfb1d88444703844d9e6373954eac05565284e..1b1137d48daed8f43a609ad66f7f0d62d01caaf7 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -11,6 +11,18 @@
        </VirtualHost>
 </Macro>
 
+<Macro common-dsa-vhost-https-redirect-temp $name>
+       <VirtualHost <%= vhost_listen %> >
+               ServerName $name
+               ServerAdmin debian-admin@lists.debian.org
+
+               CustomLog /var/log/apache2/$name-access.log privacy
+               ErrorLog /var/log/apache2/$name-error.log
+
+               Redirect / https://$name/
+       </VirtualHost>
+</Macro>
+
 <Macro common-static-base $name>
        <IfModule mod_userdir.c>
                UserDir disabled

diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
index 2d112f239383314a647919f80f3f5d59bcfd7f34..7d97eeee08e1c41248b37d17eb156c414e103dea 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -1,9 +1,15 @@
-<Virtualhost <%= vhost_listen %> >
+Use common-dsa-vhost-https-redirect-temp lintian.debian.org
+Use common-dsa-vhost-https-redirect lintian.debian.org
+
+<Virtualhost <%= vhost_listen_443 %> >
        ServerName lintian.debian.org
        ServerAdmin lintian-maint@debian.org
 
        ErrorLog /var/log/apache2/lintian.debian.org-error.log
-       CustomLog /var/log/apache2/lintian.debian.org-access.log privacy
+       CustomLog /var/log/apache2/lintian.debian.org-access.log privacyssl
+
+       Use common-debian-service-ssl lintian.debian.org
+       #Use common-ssl-HSTS
 
        <IfModule mod_userdir.c>
                UserDir disabled