X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=fea7de7e5b73f765ac9d577b22d43cffc6178902;hb=2972577c62e8dfa15c111d5072b5755c3d1550e3;hp=1f7990a7221a77a2e54dc3b816219a471d5a1ecf;hpb=140e86b64590b93b769c2ae8b4355c3a6e55d728;p=mirror%2Fdsa-puppet.git

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 1f7990a72..fea7de7e5 100644
--- 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,16 +276,26 @@ 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>
 
-<VirtualHost <%= @vhost_listen %> >
+<Macro vstatic-vhost-video.debian.net>
 	ServerName video.debian.net
 	ServerAdmin debian-admin@debian.org
-	Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+	Redirect / https://meetings-archive.debian.net/pub/debian-meetings/
+</Macro>
+
+<VirtualHost <%= @vhost_listen %> >
+	Use vstatic-vhost-video.debian.net
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+	Use vstatic-vhost-video.debian.net
+	Use common-debian-service-ssl video.debian.net
+	Use common-ssl-HSTS
 </VirtualHost>
 
 # historical sites
@@ -294,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 %> >
@@ -332,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
 #############