X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=2708282bc7d852bd7c188b4246da467246ef5ba4;hb=0fe8c322128bf214db3a7930ab299856a3c1bcc4;hp=ec36a14df8dbf3fa207c84695a38c636bb06f55e;hpb=01f29e029419572a3bbe5378f5a449fbedd78e6c;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 ec36a14df..2708282bc 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -126,14 +126,13 @@
 		AddEncoding x-gzip .gz
 		AddType text/plain .log
 
-		AddOutputFilterByType DEFLATE text/plain
+		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>
 		# Cache these for a year (3600 * 24 * 365.25)
 		# Files in here will change name if their content change
 		Header set Cache-Control "max-age=31557600, public"
-		AddOutputFilterByType DEFLATE image/svg+xml
 	</Directory>
 
 	RewriteEngine on
@@ -299,6 +298,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