X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=8b7580026b859219837a0973eba81af6ec93b3fd;hb=4326b0a78553bfe9696c10f1a69e1316acd23802;hp=f748c02c62a89df4aefea2e6023f63bfa7e3bbe8;hpb=643e9eb39d992ff1ff3d57690fcfd8a7767b146a;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb index f748c02c6..8b7580026 100644 --- a/modules/debian-org/templates/puppet.conf.erb +++ b/modules/debian-org/templates/puppet.conf.erb @@ -10,11 +10,12 @@ ssldir=/var/lib/puppet/ssl rundir=/var/run/puppet factpath=$vardir/lib/facter pluginsync=true -modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules # This is the default environment for all clients environment=production <%- if scope.lookupvar('::hostname') == 'handel' -%> +modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules + [master] environments = production,staging reports = store