X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=f76b693f99e5548492d87b05cfe19b3136236370;hb=94a2405221354b24e14db3228db348c702031d7a;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..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 @@
>
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]
>