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=38224986c26ac29b5f1b26d1ccb253a82244152d;hp=1f45252bf33880f62dbf35bf590d3438196d5d1e;hpb=f5843fa9ce051be9d829df7d3d577481b0a2b9c9;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 1f45252bf..f76b693f9 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -4,7 +4,6 @@
 	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
@@ -19,23 +18,19 @@
 
 <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
+	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 %>
 
+	CustomLog /var/log/apache2/planet.debian.org-access.log privacy
 	Use common-planet.d.o
-
-	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]
 </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