From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 29 Jul 2012 10:02:03 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dd13b76c85dcc89da5ec4eb8ba90f5a69b0dde4d;hp=8c44f1ff36f152ff0ee42cc7f372b4a20a51739b;p=dsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  we want the output
---

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index f4d97ac9..3ac67f1e 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -22,7 +22,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 -%>