Merge remote-tracking branch 'origin/master' into staging

[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 43dcd65..fe78e49 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,7 +209,7 @@ 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)
@@ -300,6 +297,33 @@ lines.join("\n")
        Use common-ssl-HSTS
 </VirtualHost>
 
+Use common-dsa-vhost-https-redirect lists.alioth.debian.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName lists.alioth.debian.org
+       ServerAdmin debian-admin@debian.org
+       Use common-debian-service-ssl lists.alioth.debian.org
+       Use common-ssl-HSTS
+       Redirect / https://alioth-lists.debian.net/
+</VirtualHost>
+
+Use common-dsa-vhost-https-redirect pkg-ruby-extras.alioth.debian.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName pkg-ruby-extras.alioth.debian.org
+       ServerAdmin debian-admin@debian.org
+       Use common-debian-service-ssl pkg-ruby-extras.alioth.debian.org
+       Use common-ssl-HSTS
+       Redirect / https://gemwatch.debian.net/
+</VirtualHost>
+
+Use common-dsa-vhost-https-redirect video.debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName video.debconf.org
+       ServerAdmin debian-admin@debian.org
+       Use common-debian-service-ssl video.debconf.org
+       Use common-ssl-HSTS
+       Redirect / https://debconf-video-team.pages.debian.net/docs/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain