projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add clementi
[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
67a4d49
..
3ac67f1
100644
(file)
--- a/
modules/debian-org/templates/puppet.conf.erb
+++ b/
modules/debian-org/templates/puppet.conf.erb
@@
-19,16
+19,17
@@
environments = development,testing,production,staging
reports = store, http
reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
config_version = cat /etc/puppet/.config-version
reports = store, http
reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
config_version = cat /etc/puppet/.config-version
-storeconfigs = true
+
thin_
storeconfigs = true
dbadapter=mysql
dbuser=puppet
dbadapter=mysql
dbuser=puppet
-dbpassword=
Oof0shee6Athoesh
+dbpassword=
<%= scope.lookupvar('dbpassword') %>
dbserver=localhost
<%- end -%>
[agent]
environments = development,testing,production,staging
report = true
dbserver=localhost
<%- end -%>
[agent]
environments = development,testing,production,staging
report = true
+configtimeout = 240
[staging]
manifestdir=/srv/puppet.debian.org/stages/staging/manifests
[staging]
manifestdir=/srv/puppet.debian.org/stages/staging/manifests