From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 25 Apr 2013 12:50:23 +0000 (+0200)
Subject: Update apache config
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=23b0492cd0c45eaefec93909a338b12bde7bed50;p=mirror%2Fdsa-puppet.git

Update apache config
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 4b8640cee..6ab16d3c8 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -6,8 +6,8 @@
 	</IfModule>
 	ServerSignature On
 
-	DocumentRoot /srv/static.debian.org/cur/$name/
-	<Directory /srv/static.debian.org/cur/$name/>
+	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
+	<Directory /srv/static.debian.org/mirrors/$name/cur>
 		AllowOverride FileInfo
 		Options Multiviews Indexes FollowSymLinks
 		IndexOptions FancyIndexing NameWidth=*
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 98806c513..ec48ff629 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -10,7 +10,7 @@
 		UserDir disabled
 	</IfModule>
 
-	DocumentRoot /srv/static.debian.org/cur/planet.debian.org
+	DocumentRoot /srv/static.debian.org/mirrors/planet.debian.org/cur
 	AddDefaultCharset utf-8
 
 	RewriteEngine On