Merge branch 'master' into staging

diff --combined fileserver.conf
index 3b6b795,2dc3000..2cd7c25
--- 1/fileserver.conf
--- 2/fileserver.conf
+++ b/fileserver.conf
@@@ -1,3 -1,8 +1,8 @@@
+ ##
+ ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+ ##
+ 
  # This file consists of arbitrarily named sections/modules
  # defining where files are served from and to whom
  
@@@ -6,7 -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
@@@ -18,4 -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