updated conf so that all served under /etc/puppet.