X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=a46871eb0fc783dadfb448e3d66190a8a3b960a7;hb=fda0578a0eafd5295a030eb57f24e444b5f30e40;hp=1dd23536fe0948796f3d2940e821acd768f9a1e0;hpb=1f84593290b93ad37e6dcdb567c3e4fefa7958a2;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 1dd23536f..a46871eb0 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -18,7 +18,7 @@
 
 <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.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 %>
@@ -27,10 +27,8 @@
 	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]
+	RewriteRule ^/(.*)        https://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
 
 <VirtualHost <%= @vhost_listen_443 %> >