X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=ca437c7bc6c6ab6349fac15652a4286bfd1901a3;hb=26e6a6719a872fd0cb8449f3604ab17c65b08261;hp=b9df97509ff7decf223ecf959dcdc4dc4916e4e8;hpb=b529b139a60ea8355089511737c8264185d8d074;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 b9df97509..ca437c7bc 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -8,10 +8,10 @@
 	ServerAlias cdn.debian.net
 	ServerAlias http.debian.net
 
-	Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
-	Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
-	Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
-	Redirect /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
+	Redirect /debian            http://cdn-fastly.deb.debian.org/debian
+	Redirect /debian-debug      http://cdn-fastly.deb.debian.org/debian-debug
+	Redirect /debian-ports      http://cdn-fastly.deb.debian.org/debian-ports
+	Redirect /debian-security   http://cdn-fastly.deb.debian.org/debian-security
 </Macro>
 
 <VirtualHost <%= @vhost_listen_443 %> >
@@ -40,15 +40,18 @@
 
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 
-	Redirect /debian/           https://cdn-aws.deb.debian.org/debian/
-	Redirect /debian-debug/     https://cdn-aws.deb.debian.org/debian-debug/
-	Redirect /debian-ports/     https://cdn-aws.deb.debian.org/debian-ports/
-	Redirect /debian-security/  https://cdn-aws.deb.debian.org/debian-security/
+	Redirect /debian            https://cdn-aws.deb.debian.org/debian
+	Redirect /debian-debug      https://cdn-aws.deb.debian.org/debian-debug
+	Redirect /debian-ports      https://cdn-aws.deb.debian.org/debian-ports
+	Redirect /debian-security   https://cdn-aws.deb.debian.org/debian-security
 </VirtualHost>
 <% end -%>
 
 <Macro vstatic-vhost-extra-network-test.debian.org>
 	ServerAlias network-test-backend.debian.org
+	<Location /nm>
+		Header set Cache-Control "must-revalidate, max-age=0"
+	</Location>
 </Macro>
 
 <Macro vstatic-vhost-extra-bits.debian.org>
@@ -78,6 +81,7 @@
 	RewriteRule		^/migration/testing.pl		/migration/cache/%2/%1.html [PT,L]
 	RewriteRule		^/migration/testing.pl		/migration/cache/_index.html
 
+	Alias /oldstable-proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
 	Alias /proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
 	<Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
 		Require all granted
@@ -122,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>
@@ -208,6 +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, "cdbuilder-logs.debian.org"     , :ssl => true)
 
 vhost(lines, "bits.debian.org"               , :ssl => true, :extra => true)
 vhost(lines, "micronews.debian.org"          , :ssl => true)
@@ -223,6 +225,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)
@@ -244,7 +248,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>
 
 ######################
@@ -271,17 +275,68 @@ 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>
+
+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
 ##################
@@ -290,24 +345,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 %> >
@@ -328,4 +383,28 @@ 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
+#############
+
+Use common-dsa-vhost-https-redirect archive.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName archive.debian.net
+	ServerAdmin debian-admin@debian.org
+	ErrorLog /var/log/apache2/archive.debian.net-error.log
+	CustomLog /var/log/apache2/archive.debian.net-access.log privacyssl
+	Use common-debian-service-ssl archive.debian.net
+	Use common-ssl-HSTS
+	Use common-disabled-service
+</VirtualHost>
+
+
 # vim:ft=apache: