From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 3 Apr 2015 11:33:40 +0000 (+0000)
Subject: correct modulepath
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ac80ccf735b0db5fe94f45b41148c5ec918c08d9;p=mirror%2Fdsa-puppet.git

correct modulepath

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index 82d0546fc..11546ebeb 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,7 +10,7 @@ ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
 pluginsync=true
-modulepath=/etc/puppet/3rdparty/modules:$modulepath
+modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
 # This is the default environment for all clients
 environment=production