X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=8a4ba7e485445b8954b8e40422a152df980ce6be;hb=03c1639d31d92fa136c3dca99a1d8043d8b4aad5;hp=53f76f347abec6282b7437a0055549d3419c85a6;hpb=81e8b5f7499e90bb8cb59f09518ed7cae95660aa;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 53f76f347..8a4ba7e48 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,20 +1,78 @@
 # puppet maintained
 
-Use common-static-vhost mozilla.debian.net
-Use common-static-vhost backports.debian.org
-Use common-static-vhost news.debian.net
-Use common-static-vhost-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8"
-Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
-Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
-Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
-Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
-Use common-static-vhost-ssl dsa.debian.org
-Use common-static-vhost-ssl rtc.debian.org
-Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org"
+<% if scope.function_has_static_component(['XXX']) -%>
+<% end -%>
+
+<%=
+
+def vhost(lines, sn, type=nil, extra=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
+
+    lines << "Use #{t} #{sn}#{e}"
+  end
+end
+
+lines = []
+vhost(lines, "mozilla.debian.net")
+vhost(lines, "backports.debian.org")
+vhost(lines, "incoming.debian.org")
+vhost(lines, "news.debian.net")
+vhost(lines, "debaday.debian.net")
+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, "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, "10years.debconf.org")
+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")
+
+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
+
+	ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
+	CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
+
+	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
 ######################
+# 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
@@ -46,6 +104,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	Use common-debian-service-ssl bits.debian.org
 	Use common-ssl-HSTS
 </VirtualHost>
+<% end -%>
 
 # www.backports.org
 ###################
@@ -62,9 +121,9 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	RedirectPermanent / http://backports.debian.org/
 </VirtualHost>
 
-
-# www.ports.debian.org
 ######################
+# 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
@@ -83,14 +142,18 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Multiviews Indexes FollowSymLinks Includes
 		IndexOptions FancyIndexing NameWidth=*
-		Order allow,deny
-		Allow from all
+		<% if @lsbmajdistrelease > '7' -%>
+			Require all granted
+		<% else -%>
+			Order allow,deny
+			Allow from all
+		<% end -%>
 	</Directory>
 
-	DefaultType text/plain
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 	AddOutputFilter INCLUDES .xhtml
 </VirtualHost>
+<% end -%>
 
 <VirtualHost <%= vhost_listen %> >
 	ServerName www.debian-ports.org
@@ -109,6 +172,15 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+# video.debian.net
+###################
+<VirtualHost <%= vhost_listen %> >
+	ServerName video.debian.net
+	ServerAdmin debian-admin@debian.org
+
+	Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain