X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=ca437c7bc6c6ab6349fac15652a4286bfd1901a3;hb=26e6a6719a872fd0cb8449f3604ab17c65b08261;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..ca437c7bc 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
@@ -210,7 +209,6 @@ 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)
@@ -299,6 +297,47 @@ 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>
+
+<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName metadata.ftp-master.debian.org
+	ServerAlias metadata-backend.ftp-master.debian.org
+	# all self-referential URLs should use the public host name
+	UseCanonicalName On
+	Use common-debian-service-ssl metadata-backend.ftp-master.debian.org
+	ErrorLog /var/log/apache2/metadata-backend.ftp-master.debian.org-error.log
+	CustomLog /var/log/apache2/metadata-backend.ftp-master.debian.org-access.log privacy
+
+	Use static-vhost-base-metadata.ftp-master.debian.org
+</VirtualHost>
+<% end -%>
+
 # historical sites
 ##################
 # now only redirects remain