Merge branch 'zobel-salsa'

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 21af9b1..fea7de7 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -126,10 +126,7 @@
                AddEncoding x-gzip .gz
                AddType text/plain .log
 
-               <IfModule mod_userdir.c>
-                       AddOutputFilterByType DEFLATE image/svg+xml
-                       AddOutputFilterByType DEFLATE text/plain
-               </IfModule>
+               AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css image/svg+xml
        </Directory>
 
        <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
@@ -212,6 +209,8 @@ vhost(lines, "rtc.debian.org"                , :ssl => true)
 vhost(lines, "mirror-master.debian.org"      , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
 vhost(lines, "manpages.debian.org"           , :ssl => true, :extra => true)
+vhost(lines, "planet.debian.net")
+vhost(lines, "cdbuilder-logs.debian.org"     , :ssl => true)
 
 vhost(lines, "bits.debian.org"               , :ssl => true, :extra => true)
 vhost(lines, "micronews.debian.org"          , :ssl => true)
@@ -227,6 +226,8 @@ vhost(lines, "debconf5.debconf.org"          , :ssl => true)
 vhost(lines, "debconf6.debconf.org"          , :ssl => true)
 vhost(lines, "debconf7.debconf.org"          , :ssl => true)
 vhost(lines, "debconf16.debconf.org"         , :ssl => true)
+vhost(lines, "debconf17.debconf.org"         , :ssl => true)
+vhost(lines, "debconf18.debconf.org"         , :ssl => true)
 vhost(lines, "es.debconf.org"                , :ssl => true)
 vhost(lines, "fr.debconf.org"                , :ssl => true)
 vhost(lines, "miniconf10.debconf.org"        , :ssl => true)
@@ -248,7 +249,7 @@ lines.join("\n")
        ServerName www.backports.org
        ServerAlias lists.backports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://backports.debian.org/
+       RedirectPermanent / https://backports.debian.org/
 </VirtualHost>
 
 ######################
@@ -275,9 +276,9 @@ lines.join("\n")
 <VirtualHost <%= @vhost_listen %> >
        ServerName ftp.debian-ports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent /archive http://www.ports.debian.org
+       RedirectPermanent /archive https://www.ports.debian.org
        RedirectPermanent /debian http://ftp.ports.debian.org/debian-ports
-       RedirectPermanent /debian-cd http://ftp.ports.debian.org/debian-ports-cd
+       RedirectPermanent /debian-cd https://cdimage.debian.org/cdimage/ports/
        RedirectPermanent / http://ftp.ports.debian.org/
 </VirtualHost>
 
@@ -304,24 +305,24 @@ lines.join("\n")
        ServerName women.debian.org
        ServerAdmin debian-admin@debian.org
 
-       RedirectPermanent / http://www.debian.org/women/
-
-       RedirectPermanent /about/ http://www.debian.org/women/about
-       RedirectPermanent /contact/ http://www.debian.org/women/contact
-       RedirectPermanent /faqs/ http://www.debian.org/women/faq
-       RedirectPermanent /home/ http://www.debian.org/women/
-       RedirectPermanent /images/dw.png http://www.debian.org/women/dw.png
-       RedirectPermanent /involvement/ http://www.debian.org/women/participate
-       RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring
-       RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
-       RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
+       RedirectPermanent / https://www.debian.org/women/
+
+       RedirectPermanent /about/ https://www.debian.org/women/about
+       RedirectPermanent /contact/ https://www.debian.org/women/contact
+       RedirectPermanent /faqs/ https://www.debian.org/women/faq
+       RedirectPermanent /home/ https://www.debian.org/women/
+       RedirectPermanent /images/dw.png https://www.debian.org/women/dw.png
+       RedirectPermanent /involvement/ https://www.debian.org/women/participate
+       RedirectPermanent /mentoring/ https://www.debian.org/women/mentoring
+       RedirectPermanent /press/ https://wiki.debian.org/DebianWomen/Press
+       RedirectPermanent /profiles/ https://www.debian.org/women/profiles/
 </VirtualHost>
 
 <VirtualHost <%= @vhost_listen %> >
        ServerName volatile.debian.org
        ServerAlias volatile-master.debian.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://www.debian.org/volatile/
+       RedirectPermanent / https://www.debian.org/volatile/
 </VirtualHost>
 
 <VirtualHost <%= @vhost_listen %> >
@@ -342,6 +343,15 @@ lines.join("\n")
        Redirect / https://manpages.debian.org/
 </VirtualHost>
 
+Use common-dsa-vhost-https-redirect sources.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName sources.debian.net
+       ServerAdmin debian-admin@debian.org
+       Use common-debian-service-ssl sources.debian.net
+       Use common-ssl-HSTS
+       Redirect permanent / https://sources.debian.org/
+</VirtualHost>
+
 # error pages
 #############