From: Stephen Gran <steve@lobefin.net>
Date: Mon, 16 Sep 2013 07:12:02 +0000 (+0100)
Subject: judicious s/org/srv/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=048cae23b9355cf720b1c97fd40708cb1b108564;p=mirror%2Fdsa-puppet.git

judicious s/org/srv/

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/roles/files/buildd_master/apache.conf b/modules/roles/files/buildd_master/apache.conf
index 6832874dd..2950b57c9 100644
--- a/modules/roles/files/buildd_master/apache.conf
+++ b/modules/roles/files/buildd_master/apache.conf
@@ -11,7 +11,7 @@
 
 <VirtualHost *:80>
 	ServerAdmin admin@buildd.debian.org
-	DocumentRoot /org/buildd.debian.org/web
+	DocumentRoot /srv/buildd.debian.org/web
 	ServerName buildd.debian.org
 	DirectoryIndex index.html index.php index.cgi
 	ErrorLog /var/log/apache2/buildd.debian.org-error.log
@@ -26,7 +26,7 @@
 
 <VirtualHost *:443>
 	ServerAdmin admin@buildd.debian.org
-	DocumentRoot /org/buildd.debian.org/web
+	DocumentRoot /srv/buildd.debian.org/web
 	ServerName buildd.debian.org
 	DirectoryIndex index.html index.php index.cgi
 	ErrorLog /var/log/apache2/buildd.debian.org-error.log
@@ -37,7 +37,7 @@
 	SSLCertificateKeyFile /etc/ssl/private/buildd.debian.org.key
 	SSLCertificateChainFile /etc/ssl/certs/buildd.debian.org-chained.pem
 
-	<Directory /org/buildd.debian.org/web>
+	<Directory /srv/buildd.debian.org/web>
 		Use BuilddACL
 		AddHandler cgi-script .cgi
 		Options +ExecCGI +FollowSymLinks
@@ -48,20 +48,20 @@
                         Options ExecCGI
                 </Files>
 	</Directory>
-	<Directory /org/buildd.debian.org/git>
+	<Directory /srv/buildd.debian.org/git>
 		Use BuilddACL
 		AllowOverride none
 		Options +FollowSymlinks +Indexes
 	</Directory>
-	<Directory /org/buildd.debian.org/etc/packages-arch-specific/checkout/>
+	<Directory /srv/buildd.debian.org/etc/packages-arch-specific/checkout/>
 		Use BuilddACL
 		AllowOverride none
 		Options +FollowSymlinks +Indexes
 	</Directory>
 
-	Alias /git/ /org/buildd.debian.org/git/
-	Alias /quinn-diff/ /org/buildd.debian.org/etc/packages-arch-specific/checkout/
-        Alias /apt/ /org/buildd.debian.org/ftp-archive/archive/
+	Alias /git/ /srv/buildd.debian.org/git/
+	Alias /quinn-diff/ /srv/buildd.debian.org/etc/packages-arch-specific/checkout/
+        Alias /apt/ /srv/buildd.debian.org/ftp-archive/archive/
 
 	RewriteEngine on
 	RewriteRule ^/\.git$ - [L]