From: Stephen Gran <steve@lobefin.net>
Date: Sat, 9 Jan 2010 12:24:01 +0000 (+0000)
Subject: Merge branch 'master' into staging
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ac5b65349283c0e3350b01aad5a263a4eb5b56a1;hp=5940cb4bff36ee16e29c1707becc42de4e3f7714;p=mirror%2Fdsa-puppet.git

Merge branch 'master' into staging
---

diff --git a/fileserver.conf b/fileserver.conf
index 2dc300035..2cd7c25de 100644
--- a/fileserver.conf
+++ b/fileserver.conf
@@ -11,7 +11,7 @@
 # for allow/deny does not matter, allow always takes precedence
 # over deny
 [files]
-  path /etc/puppet/files
+  path /srv/puppet.debian.org/stages/staging/files
   allow *.debian.org
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24
@@ -23,4 +23,4 @@
 #  allow 192.168.0.0/24
 [facts]
   allow *.debian.org
-  path /etc/puppet/facts
+  path /srv/puppet.debian.org/stages/staging/facts