projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix munin 1
[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
..
8b75800
100644
(file)
--- a/
modules/debian-org/templates/puppet.conf.erb
+++ b/
modules/debian-org/templates/puppet.conf.erb
@@
-14,23
+14,31
@@
pluginsync=true
environment=production
<%- if scope.lookupvar('::hostname') == 'handel' -%>
environment=production
<%- if scope.lookupvar('::hostname') == 'handel' -%>
+modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
+
[master]
[master]
-environments = development,testing,production,staging
-reports = store, http
-reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
+environments = production,staging
+reports = store
config_version = cat /etc/puppet/.config-version
storeconfigs = true
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
dbserver=localhost
-<%- end -%>
-[agent]
-environments = development,testing,production,staging
-report = true
+[production]
+manifestdir=/srv/puppet.debian.org/stages/production/manifests
+fileserverconfig=/srv/puppet.debian.org/stages/production/fileserver.conf
+modulepath=/srv/puppet.debian.org/stages/production/modules:/srv/puppet.debian.org/stages/production/3rdparty/modules
[staging]
manifestdir=/srv/puppet.debian.org/stages/staging/manifests
fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
[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
+<%- end -%>
+
+[agent]
+environments = development,testing,production,staging
+report = true
+configtimeout = 240