projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3800134
)
we want the output
author
Stephen Gran
<steve@lobefin.net>
Sun, 29 Jul 2012 09:51:09 +0000
(10:51 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Sun, 29 Jul 2012 09:51:18 +0000
(10:51 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/debian-org/templates/puppet.conf.erb
patch
|
blob
|
history
diff --git
a/modules/debian-org/templates/puppet.conf.erb
b/modules/debian-org/templates/puppet.conf.erb
index
f4d97ac
..
3ac67f1
100644
(file)
--- 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 -%>