X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=af78385947bcd2083db250b2e955eaf0707de06b;hb=0393573e7f8beb4ada801a0e009b24ce59f96b4c;hp=2e0ed8c1273884644641ccc5b5baeae2575bbd1f;hpb=2b56671e43a6347bfad180955c5bb14aa5c03d0d;p=dsa-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 2e0ed8c1..af783859 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,16 +2,33 @@
 
 Use common-static-vhost mozilla.debian.net
 Use common-static-vhost backports.debian.org
+Use common-static-vhost incoming.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 debaday.debian.net
+Use common-static-vhost debdeltas.debian.net
 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 appstream.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"
 
+# 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>
 
 # bits.debian.org
 ######################
@@ -33,7 +50,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	RewriteEngine On
 	RewriteCond %{REQUEST_URI} !^/feeds/
 	RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L]
-	#RewriteRule ^/(.*)$ https://bits.debian.org/$1 [NC,R=301,L]
+	#RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L]
 
 	Use static-bits.debian.org-base
 	CustomLog /var/log/apache2/bits.debian.org-access.log privacy
@@ -44,7 +61,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
 
 	Use common-debian-service-ssl bits.debian.org
-	# Use common-ssl-HSTS
+	Use common-ssl-HSTS
 </VirtualHost>
 
 # www.backports.org
@@ -83,8 +100,12 @@ 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