summaryrefslogtreecommitdiff
path: root/global/overlay/etc
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-12-20 13:59:33 +0100
committerLeif Johansson <leifj@sunet.se>2013-12-20 13:59:33 +0100
commit45e2a1c1defacb2034c877b71fcf50e961214e72 (patch)
tree67ee314b8c9f0d79e1ab81025c931c5bbbf474c8 /global/overlay/etc
parent792cc2df254276da2b629cb2b321953483cbfdbf (diff)
parent67337f5c7cba477b9e4a37d0e85ca5b0e7426f65 (diff)
Merge branch 'master' of git://github.com/leifj/multiverse into multiverse
Diffstat (limited to 'global/overlay/etc')
-rw-r--r--global/overlay/etc/puppet/puppet.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf
index 0ba85f4..a269892 100644
--- a/global/overlay/etc/puppet/puppet.conf
+++ b/global/overlay/etc/puppet/puppet.conf
@@ -7,6 +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
[master]
# These are needed when the puppetmaster is run by passenger