X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=498677c6fa5634fca7194f07b60f47d304e631b9;hb=d2e73a9e90b6d671c545ba2c552239bf55e1f20f;hp=c052d8bbc7f6146f83e6f3554ae2af55dbd592b8;hpb=a891021c56652d8cd222d9755cd516302aef4f9b;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 c052d8bbc..498677c6f 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,8 +2,9 @@
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-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"
@@ -13,6 +14,43 @@ 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
+######################
+
+ ServerName bits.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/bits.debian.org-error.log
+
+ CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
+
+
+ Use common-static-base bits.debian.org
+
+
+ >
+ 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
+
+
+ >
+ 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
+
+
+# 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.
@@ -27,25 +65,8 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
- >
- 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/
-
-
-# debian ports stuff
-####################
+# www.ports.debian.org
+######################
>
ServerName www.ports.debian.org
ServerAlias www.ports-backend.debian.org
@@ -90,6 +111,26 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
RedirectPermanent / http://www.ports.debian.org/
+# historical sites
+##################
+# now only redirects remain
+ >
+ 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/
+
+
>
ServerName volatile.debian.org
ServerAlias volatile-master.debian.org