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=a46871eb0fc783dadfb448e3d66190a8a3b960a7;hb=fda0578a0eafd5295a030eb57f24e444b5f30e40;hp=7d0ab0159ebdf998db8ccb865d4cf475f75af1fe;hpb=bff0869ff84e1f232aa17385eb0b94240bf9117e;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 7d0ab0159..a46871eb0 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -1,15 +1,9 @@
 <% if scope.function_has_static_component(['planet.debian.org']) -%>
 
-<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
-	<% if scope.function_onion_global_service_hostname(['planet.debian.org']) -%>
-	ServerAlias <%= scope.function_onion_global_service_hostname(['planet.debian.org']) %>
-	<% end %>
+<Macro common-planet.d.o>
 	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
@@ -20,13 +14,32 @@
 	<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
 		Require all granted
 	</Directory>
+</Macro>
+
+<Virtualhost <%= @vhost_listen %> >
+	ServerName planet.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 %>
+
+	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]
+	RewriteRule ^/(.*)        https://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
+
 </VirtualHost>
+
 <% end -%>
 
 # vim:set syn=apache: