X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=f76b693f99e5548492d87b05cfe19b3136236370;hb=26e6a6719a872fd0cb8449f3604ab17c65b08261;hp=9dca69c6eea6c0df1f7ccf14da662e25a584e433;hpb=f7b6fdd2d515765d88696ced52fb0e7e4dda06c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
index 9dca69c6e..f76b693f9 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -1,15 +1,9 @@
 <% if scope.function_has_static_component(['planet.debian.org']) -%>
 
-<Virtualhost <%= @vhost_listen %> >
-	ServerName planet.debian.org
-	ServerAlias planet.debian.net planeta.debian.net planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org
-	<% if scope.function_onion_global_service_hostname(['planet.debian.org']) -%>
-	ServerAlias <%= scope.function_onion_global_service_hostname(['planet.debian.org']) %>
-	<% end %>
+<Macro common-planet.d.o>
 	ServerAdmin planet@debian.org
 
 	ErrorLog /var/log/apache2/planet.debian.org-error.log
-	CustomLog /var/log/apache2/planet.debian.org-access.log privacy
 
 	<IfModule mod_userdir.c>
 		UserDir disabled
@@ -20,13 +14,28 @@
 	<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
 		Require all granted
 	</Directory>
+</Macro>
+
+<Virtualhost <%= @vhost_listen %> >
+	ServerName planet.debian.org
+	ServerAlias planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org
+	<% if scope.function_onion_global_service_hostname(['planet.debian.org']) -%>
+	ServerAlias <%= scope.function_onion_global_service_hostname(['planet.debian.org']) %>
+	<% end %>
 
-	RewriteEngine On
-	RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
-	RewriteRule ^/(.*)        http://planet.debian.org/es/$1  [R=permanent,L]
-	RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
-	RewriteRule ^/(.*)        http://planet.debian.org/$1  [R=permanent,L]
+	CustomLog /var/log/apache2/planet.debian.org-access.log privacy
+	Use common-planet.d.o
 </VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName planet-backend.debian.org
+
+	CustomLog /var/log/apache2/planet.debian.org-access.log privacyssl
+	Use common-debian-service-ssl planet-backend.debian.org
+	Use common-planet.d.o
+
+</VirtualHost>
+
 <% end -%>
 
 # vim:set syn=apache: