projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
files
/
etc
/
puppet
/
puppet.conf
diff --git
a/files/etc/puppet/puppet.conf
b/files/etc/puppet/puppet.conf
index
1a83946
..
c200706
100644
(file)
--- a/
files/etc/puppet/puppet.conf
+++ b/
files/etc/puppet/puppet.conf
@@
-11,7
+11,7
@@
rundir=/var/run/puppet
factpath=$vardir/facts
pluginsync=true
# This is the default environment for all clients
-environment=production
+environment=production
[puppetmasterd]
templatedir=/etc/puppet/templates