Add new module elasticsearch for listsearch

[mirror/dsa-puppet.git] / modules / debian-org / templates / puppet.conf.erb

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index f4d97ac..82d0546 100644 (file)
--- 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/3rdparty/modules:$modulepath
 # 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 -%>