From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 4 Jan 2010 22:02:18 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8ccf0c5a44fa4771bd7b9d7eac06c9d73e0a77ad;hp=99c48a48d692ac1b03dcb025505602f9210816f9;p=dsa-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 2dc30003..2cd7c25d 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