summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet/puppet.conf
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-02-24 11:13:47 +0100
committerLeif Johansson <leifj@sunet.se>2015-02-24 11:13:47 +0100
commit7863ad617033064d6b5758d3d1f4bba32b9cc5dd (patch)
tree57cddfbc3b3ecbad158df496cb749bfc4ab355b7 /global/overlay/etc/puppet/puppet.conf
parentc6af45e481b4e089d4d48cdf5ac0831204def912 (diff)
parentbc70832f4c33a458f2e913af702823539b2da7a1 (diff)
Merge branch 'master' of git://github.com/leifj/multiverse into multiverse
Diffstat (limited to 'global/overlay/etc/puppet/puppet.conf')
-rw-r--r--global/overlay/etc/puppet/puppet.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf
index a269892..88871f0 100644
--- a/global/overlay/etc/puppet/puppet.conf
+++ b/global/overlay/etc/puppet/puppet.conf
@@ -7,7 +7,7 @@ factpath=$vardir/lib/facter
templatedir=$confdir/templates
node_terminus = exec
external_nodes = /etc/puppet/cosmos_enc.py
-modulepath = /etc/puppet/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules
+basemodulepath = /etc/puppet/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules
[master]
# These are needed when the puppetmaster is run by passenger