projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "maybe staging needs a default environment of staging?"
[mirror/dsa-puppet.git]
/
files
/
etc
/
puppet
/
puppet.conf
diff --git
a/files/etc/puppet/puppet.conf
b/files/etc/puppet/puppet.conf
index
7343e3d
..
1a83946
100644
(file)
--- a/
files/etc/puppet/puppet.conf
+++ b/
files/etc/puppet/puppet.conf
@@
-16,13
+16,14
@@
environment=production
[puppetmasterd]
templatedir=/etc/puppet/templates
libdir=/etc/puppet/lib
[puppetmasterd]
templatedir=/etc/puppet/templates
libdir=/etc/puppet/lib
+environments = development,testing,production,staging
[puppetd]
environments = development,testing,production,staging
[staging]
[puppetd]
environments = development,testing,production,staging
[staging]
-templatedir=/srv/puppet.debian.org/stages/staging/templates
libdir=/etc/puppet/lib
libdir=/etc/puppet/lib
+manifestdir=/srv/puppet.debian.org/stages/staging/manifests
+templatedir=/srv/puppet.debian.org/stages/staging/templates
+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
-manifestdir=/srv/puppet.debian.org/stages/staging/manifests/
-fileservercfg=/srv/puppet.debian.org/stages/staging/fileserver.conf