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=a74b52357ea7cd46947ea6f31d09bf550c2debe2;hp=a46871eb0fc783dadfb448e3d66190a8a3b960a7;hpb=fda0578a0eafd5295a030eb57f24e444b5f30e40;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 a46871eb0..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,17 +18,13 @@
>
ServerName planet.debian.org
- ServerAlias planet.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} ^planet.debian.net$ [NC]
- RewriteRule ^/(.*) https://planet.debian.org/$1 [R=permanent,L]
>