From: Stephen Gran Date: Mon, 18 Jan 2010 21:10:57 +0000 (+0000) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=e1320b1844a31f71bbeea888fd76ad55270f56ce;hp=ebb3d7225ebf504a7726ce6d30cbeb417adb5ccc Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet --- diff --git a/fileserver.conf b/fileserver.conf index 88af72d7..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