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=5aaa05685dbd006220ead8ae6f78e4fcfd26370e;hpb=b7b61c0ee3d15e815c8e89cfc417e9044ab84697;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 5aaa0568..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,14 +2,57 @@
 
 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-with-extra ftp-master.metadata.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 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
 # website and archive.  It is now a CNAME to backports.debian.org:
 # redirect http requests.
@@ -24,25 +67,8 @@ Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-
 </VirtualHost>
 
 
-<VirtualHost <%= vhost_listen %> >
-	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/
-</VirtualHost>
-
-# debian ports stuff
-####################
+# www.ports.debian.org
+######################
 <Virtualhost <%= vhost_listen %> >
 	ServerName www.ports.debian.org
 	ServerAlias www.ports-backend.debian.org
@@ -59,13 +85,19 @@ Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-
 	DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur
 	<Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
 		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>
 
 <VirtualHost <%= vhost_listen %> >
@@ -85,4 +117,37 @@ Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-
 	RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+# historical sites
+##################
+# now only redirects remain
+<VirtualHost <%= vhost_listen %> >
+	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/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName volatile.debian.org
+	ServerAlias volatile-master.debian.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://www.debian.org/volatile/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ftp-master.metadata.debian.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://metadata.ftp-master.debian.org/
+</VirtualHost>
+
 # vim:ft=apache: