move deprecated modulepath so it is only set on the master
authorPeter Palfrader <peter@palfrader.org>
Sun, 16 Oct 2016 07:22:40 +0000 (09:22 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 16 Oct 2016 07:22:40 +0000 (09:22 +0200)
modules/debian-org/templates/puppet.conf.erb

index f748c02..8b75800 100644 (file)
@@ -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