X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=983264ed156d4147eeb8403ceb5910edbecf7553;hb=c54d3c0937444eb08707008c85d9e8734448c135;hp=0cb65ad1373b235c2c8d7ee11b3787ae38e6090f;hpb=a0251c92be2191ffa8a3c7572237a56de6b97bdb;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 0cb65ad13..983264ed1 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,108 +1,139 @@
 # puppet maintained
 
+######################
+# deb.debian.org
+<% if scope.function_has_static_component(['deb.debian.org']) -%>
+<Macro vhost-deb.debian.org-extra>
+	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>
+<% end -%>
+
+<Macro vhost-network-test.debian.org-extra>
+	ServerAlias network-test-backend.debian.org
+</Macro>
+
+<Macro vhost-bits.debian.org-extra>
+	<IfModule mod_geoip.c>
+		CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
+	</IfModule>
+</Macro>
+
+<Macro vhost-metadata.ftp-master.debian.org-extra>
+	AddDefaultCharset utf-8
+	<LocationMatch "/changelogs/(main|contrib|non-free)">
+		ForceType text/plain
+	</LocationMatch>
+</Macro>
+
 <%=
 
-def vhost(lines, sn, type=nil, extra=nil)
+def vhost(lines, sn, type=nil)
   if scope.function_has_static_component([sn])
     t = 'common-static-vhost'
     if type then t += "-#{type}"; end
 
-    e = ''
-    if extra then e += " #{extra}"; end
+    onion = scope.function_onion_global_service_hostname([sn])
+    onion = "unavailable-onion.invalid" if onion.nil?
 
-    lines << "Use #{t} #{sn}#{e}"
+    lines << "Use #{t} #{sn} #{onion}"
   end
 end
 
 lines = []
 vhost(lines, "mozilla.debian.net")
-vhost(lines, "backports.debian.org")
+vhost(lines, "backports.debian.org", "ssl")
 vhost(lines, "incoming.debian.org")
-vhost(lines, "news.debian.net")
-vhost(lines, "debaday.debian.net")
+vhost(lines, "incoming.ports.debian.org")
 vhost(lines, "debdeltas.debian.net")
-vhost(lines, "timeline.debian.net")
-vhost(lines, "network-test.debian.org" , "with-extra", '"ServerAlias network-test-backend.debian.org"')
-vhost(lines, "blends.debian.org"       , "with-extra", '"ServerAlias blends-backend.debian.org"')
-vhost(lines, "wnpp-by-tags.debian.net" , "with-extra", '"ServerAlias wnpp-by-tags-backend.debian.org"')
-vhost(lines, "security-team.debian.org", "with-extra", '"ServerAlias security-team-backend.debian.org"')
+vhost(lines, "news.debian.net"         , "ssl")
+vhost(lines, "debaday.debian.net"      , "ssl")
+vhost(lines, "timeline.debian.net"     , "ssl")
+vhost(lines, "network-test.debian.org" , "with-extra")
+vhost(lines, "blends.debian.org"       , "ssl")
+vhost(lines, "wnpp-by-tags.debian.net" , "ssl")
+vhost(lines, "security-team.debian.org", "ssl")
 vhost(lines, "d-i.debian.org"      , "ssl")
 vhost(lines, "appstream.debian.org", "ssl")
 vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
+vhost(lines, "onion.debian.org"    , "ssl")
 
-vhost(lines, "10years.debconf.org")
+vhost(lines, "bits.debian.org", "ssl-with-extra")
+vhost(lines, "metadata.ftp-master.debian.org", "with-extra")
+
+vhost(lines, "10years.debconf.org" , "ssl")
 vhost(lines, "debconf0.debconf.org", "ssl")
 vhost(lines, "debconf1.debconf.org", "ssl")
-vhost(lines, "debconf2.debconf.org")
-vhost(lines, "debconf3.debconf.org")
-vhost(lines, "debconf4.debconf.org")
-vhost(lines, "debconf5.debconf.org")
-vhost(lines, "debconf6.debconf.org")
-vhost(lines, "debconf7.debconf.org")
-vhost(lines, "es.debconf.org")
-vhost(lines, "fr.debconf.org")
-vhost(lines, "miniconf10.debconf.org")
-
-vhost(lines, "deb.debian.org")
+vhost(lines, "debconf2.debconf.org", "ssl")
+vhost(lines, "debconf3.debconf.org", "ssl")
+vhost(lines, "debconf4.debconf.org", "ssl")
+vhost(lines, "debconf5.debconf.org", "ssl")
+vhost(lines, "debconf6.debconf.org", "ssl")
+vhost(lines, "debconf7.debconf.org", "ssl")
+vhost(lines, "es.debconf.org"      , "ssl")
+vhost(lines, "fr.debconf.org"      , "ssl")
+vhost(lines, "miniconf10.debconf.org" , "ssl")
+
+vhost(lines, "deb.debian.org", "with-extra")
 
 lines.join("\n")
 -%>
 
 ######################
-# metadata.ftp-master.debian.org
-<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
-<VirtualHost <%= vhost_listen %> >
-	ServerName metadata.ftp-master.debian.org
-	ServerAdmin debian-admin@lists.debian.org
+# release.debian.org
+<% if scope.function_has_static_component(['release.debian.org']) -%>
+Use common-dsa-vhost-https-redirect release.debian.org
 
-	ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
-	CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
+<Macro vhost-inner-release.debian.org>
 
-	Use common-static-base metadata.ftp-master.debian.org
-	AddDefaultCharset utf-8
-	<LocationMatch "/changelogs/(main|contrib|non-free)">
-		ForceType text/plain
-	</LocationMatch>
-</VirtualHost>
-<% end -%>
-
-######################
-# bits.debian.org
-<% if scope.function_has_static_component(['bits.debian.org']) -%>
-<Macro static-bits.debian.org-base>
-	ServerName bits.debian.org
-	ServerAdmin debian-admin@lists.debian.org
-
-	ErrorLog /var/log/apache2/bits.debian.org-error.log
-	<IfModule mod_geoip.c>
-		CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
-	</IfModule>
+	ServerAdmin debian-admin@debian.org
 
-	Use common-static-base bits.debian.org
-</Macro>
+	ErrorLog /var/log/apache2/release.debian.org-error.log
+	CustomLog /var/log/apache2/release.debian.org-access.log privacy
 
-<Virtualhost <%= vhost_listen %> >
-	RewriteEngine on
+	Use common-static-base release.debian.org
 
-	RewriteEngine On
-	RewriteCond %{REQUEST_URI} !^/feeds/
-	RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L]
-	#RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L]
+	RewriteEngine	on
+	RewriteRule		^/migration/$			/migration/testing.pl
+	RewriteRule		^/migration/search/(.+)/$	/migration/testing.pl?package=$1
+	RewriteCond		%{QUERY_STRING} package=((.)(.*))
+	RewriteRule		^/migration/testing.pl		/migration/cache/%2/%1.html [PT,L]
+	RewriteRule		^/migration/testing.pl		/migration/cache/_index.html
 
-	Use static-bits.debian.org-base
-	CustomLog /var/log/apache2/bits.debian.org-access.log privacy
-</VirtualHost>
+	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
+		Options Indexes SymLinksIfOwnerMatch MultiViews
+		IndexOptions FancyIndexing NameWidth=*
 
-<Virtualhost <%= vhost_listen_443 %> >
-	Use static-bits.debian.org-base
-	CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
+		AddEncoding gzip .gz
+		FilterDeclare gzip CONTENT_SET
+		FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
+		FilterChain gzip
+		<Files *.debdiff.gz>
+			ForceType text/plain
+		</Files>
+	</Directory>
+</Macro>
 
-	Use common-debian-service-ssl bits.debian.org
+<VirtualHost <%= vhost_listen_443 %> >
+	ServerName release.debian.org
+	Use common-debian-service-ssl release.debian.org
 	Use common-ssl-HSTS
+	Use vhost-inner-release.debian.org
+</VirtualHost>
+<% if scope.function_onion_global_service_hostname(['release.debian.org']) -%>
+<Virtualhost <%= vhost_listen %> >
+	ServerName <%= scope.function_onion_global_service_hostname(['release.debian.org']) %>
+	Use vhost-inner-release.debian.org
 </VirtualHost>
 <% end -%>
 
+<% end -%>
+
 # www.backports.org
 ###################
 # www.backports.org is the historical place for the backports
@@ -112,23 +143,22 @@ lines.join("\n")
 	ServerName www.backports.org
 	ServerAlias lists.backports.org
 	ServerAdmin debian-admin@debian.org
-	RedirectPermanent /debian/           http://backports.debian.org/debian-backports/
-	RedirectPermanent /backports.org/    http://backports.debian.org/debian-backports/
-	RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
 	RedirectPermanent / http://backports.debian.org/
 </VirtualHost>
 
 ######################
 # www.ports.debian.org
 <% if scope.function_has_static_component(['www.ports.debian.org']) -%>
-<Virtualhost <%= vhost_listen %> >
-	ServerName www.ports.debian.org
-	ServerAlias www.ports-backend.debian.org
+
+Use common-dsa-vhost-https-redirect www.ports.debian.org
+
+<Macro vhost-inner-www.ports.debian.org>
 	ServerAdmin debian-admin@lists.debian.org
 
 	ErrorLog /var/log/apache2/www.ports.debian.org-error.log
 	CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
 
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
@@ -139,34 +169,55 @@ lines.join("\n")
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Multiviews Indexes FollowSymLinks Includes
 		IndexOptions FancyIndexing NameWidth=*
-		<% if @lsbmajdistrelease > '7' -%>
-			Require all granted
-		<% else -%>
-			Order allow,deny
-			Allow from all
-		<% end -%>
+		Require all granted
 	</Directory>
 
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 	AddOutputFilter INCLUDES .xhtml
+</Macro>
+
+<Virtualhost <%= vhost_listen_443 %> >
+	ServerName www.ports.debian.org
+	ServerAlias www.ports-backend.debian.org
+	Use common-debian-service-ssl www.ports.debian.org
+	Use common-ssl-HSTS
+	Use vhost-inner-www.ports.debian.org
+</VirtualHost>
+<% if scope.function_onion_global_service_hostname(['www.ports.debian.org']) -%>
+<Virtualhost <%= vhost_listen %> >
+	ServerName <%= scope.function_onion_global_service_hostname(['www.ports.debian.org']) %>
+	Use vhost-inner-www.ports.debian.org
 </VirtualHost>
 <% end -%>
+<% end -%>
 
 <VirtualHost <%= vhost_listen %> >
 	ServerName www.debian-ports.org
 	ServerAlias debian-ports.org
 	ServerAdmin debian-admin@debian.org
-	RedirectPermanent /archive/           http://archive.ports.debian.org/archive/
-	RedirectPermanent /debian-cd/         http://archive.ports.debian.org/debian-cd/
-	RedirectPermanent /debian-snapshot/   http://archive.ports.debian.org/debian-snapshot/
-	RedirectPermanent /debian/            http://archive.ports.debian.org/debian/
-	RedirectPermanent / http://www.ports.debian.org/
+	RedirectPermanent / https://www.ports.debian.org/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ports.debian.org
+	ServerAlias ports.debian.net
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / https://www.ports.debian.org/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName incoming.debian-ports.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://incoming.ports.debian.org/
 </VirtualHost>
 
 <VirtualHost <%= vhost_listen %> >
-	ServerName ports.debian.net
+	ServerName ftp.debian-ports.org
 	ServerAdmin debian-admin@debian.org
-	RedirectPermanent / http://www.ports.debian.org/
+	RedirectPermanent /archive http://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 / http://ftp.ports.debian.org/
 </VirtualHost>
 
 # video.debian.net