X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=5064c8f50475467275cee168eab8a0d72a47f4a4;hb=a99babdcddb9c2f776c0a7f8355361caffc6ec20;hp=cbf4c6bff368d242556016cd928c45f390be3988;hpb=da0708b0299bb96910822eef24feaaee5426f3c8;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 cbf4c6bf..5064c8f5 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,17 +2,55 @@
 
 Use common-static-vhost mozilla.debian.net
 Use common-static-vhost backports.debian.org
-Use common-static-vhost-publiclog bits.debian.org
+Use common-static-vhost incoming.debian.org
 Use common-static-vhost news.debian.net
+Use common-static-vhost debaday.debian.net
+Use common-static-vhost debdeltas.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 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"
 
+
+# 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>
+
+	Use common-static-base bits.debian.org
+</Macro>
+
+<Virtualhost <%= vhost_listen %> >
+	RewriteEngine on
+
+	RewriteEngine On
+	RewriteCond %{REQUEST_URI} !^/feeds/
+	RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,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
+</VirtualHost>
+
+<Virtualhost <%= vhost_listen_443 %> >
+	Use static-bits.debian.org-base
+	CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
+
+	Use common-debian-service-ssl bits.debian.org
+	Use common-ssl-HSTS
+</VirtualHost>
+
 # www.backports.org
 ###################
 # www.backports.org is the historical place for the backports
@@ -49,8 +87,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