X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=13fe1372c75087cd8a22b6db9a2e5defc706d991;hb=52bb3bde6163ca33b597424d91e64e246c593538;hp=f4d97ac98f1d0f1e5de86e53117ecfbc0deed6da;hpb=1e341bf93cda9564ae029683e2e534182ba484a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index f4d97ac98..13fe1372c 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,6 +10,7 @@ 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
 
@@ -22,7 +23,7 @@ config_version = cat /etc/puppet/.config-version
 thin_storeconfigs = true
 dbadapter=mysql
 dbuser=puppet
-dbpassword=<% scope.lookupvar('dbpassword') %>
+dbpassword=<%= scope.lookupvar('dbpassword') %>
 dbserver=localhost
 <%- end -%>
 
@@ -34,4 +35,4 @@ configtimeout = 240
 [staging]
 manifestdir=/srv/puppet.debian.org/stages/staging/manifests
 fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
-modulepath=/srv/puppet.debian.org/stages/staging/modules
+modulepath=/srv/puppet.debian.org/stages/staging/modules:/srv/puppet.debian.org/stages/staging/3rdparty/modules