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=e0289be0c741025a2ad50284a2fe191ae5505d61;hpb=fd9786a4cb26aab631f426f798dae95b15fe6849;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 e0289be0c..f76b693f9 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -18,19 +18,13 @@
 
 <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 ^/(.*)        https://planet.debian.org/es/$1  [R=permanent,L]
-	RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
-	RewriteRule ^/(.*)        https://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
 
 <VirtualHost <%= @vhost_listen_443 %> >