X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=c4b79c6e0ea6510b3a05c932151fd67b0465a3f9;hb=245e40f490f4cade71aa380d51e640a12a31cd8e;hp=30a186eaa52cb53eefc4a61b37a2cb96cca8600f;hpb=cc0b6e462d95cdc737e366a526c41ab6ce698568;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 30a186eaa..c4b79c6e0 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,8 @@
 		AddEncoding x-gzip .gz
 		AddType text/plain .log
 
-		<IfModule mod_userdir.c>
-			AddOutputFilterByType DEFLATE image/svg+xml
-			AddOutputFilterByType DEFLATE text/plain
-		</IfModule>
+		AddOutputFilterByType DEFLATE image/svg+xml
+		AddOutputFilterByType DEFLATE text/plain
 	</Directory>
 
 	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
@@ -158,10 +156,6 @@
 	</FilesMatch>
 </Macro>
 
-<Macro vstatic-vhost-extra-sources.debian.net>
-	Redirect permanent / https://sources.debian.org/
-</Macro>
-
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -195,7 +189,6 @@ end
 
 lines = []
 vhost(lines, "mozilla.debian.net"            , :ssl => true, :ssl_optional => true)
-vhost(lines, "sources.debian.net"            , :ssl => true, :extra => true)
 vhost(lines, "backports.debian.org"          , :ssl => true)
 vhost(lines, "incoming.debian.org"           , :ssl => true, :ssl_optional => true)
 vhost(lines, "incoming.ports.debian.org"     , :ssl => true, :ssl_optional => true)
@@ -217,6 +210,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)
@@ -255,7 +250,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>
 
 ######################
@@ -282,7 +277,7 @@ 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 https://cdimage.debian.org/cdimage/ports/
 	RedirectPermanent / http://ftp.ports.debian.org/
@@ -349,6 +344,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
 #############