From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 26 Dec 2009 16:58:28 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f4702fedb73ca0c0d70cc2054a64c4523d26c781;hp=3cf65a9432924a99cc409622c4b8f9037b57bb2c;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet into staging
---

diff --git a/fileserver.conf b/fileserver.conf
index dfc3f68a2..3b6b79547 100644
--- a/fileserver.conf
+++ b/fileserver.conf
@@ -6,7 +6,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
@@ -18,4 +18,4 @@
 #  allow 192.168.0.0/24
 [facts]
   allow *.debian.org
-  path /etc/puppet/facts
+  path /srv/puppet.debian.org/stages/staging/facts