Please review pull request #124: Empty puppet.conf before adding the server definition. opened by (daniel-pittman)
Description:
Previously /etc/puppet/puppet.conf would grow without bounds, because this
setup script appended to the configuration but never removed anything. Now,
instead, it ensures that only the expected content is in place.
Signed-off-by: Daniel Pittman [email protected]
- Opened: Mon Jan 30 01:11:19 UTC 2012
- Based on: puppetlabs:master (31e61a1c8c4639a5a8ebebe19985199f19c45744)
- Requested merge: daniel-pittman:avoid-eternally-growing-puppet.conf (ed6dab8b222ea132bc9f3a75e9a0335bb57e82ed)
Diff follows:
diff --git a/setup/git/01_TestSetup.rb b/setup/git/01_TestSetup.rb
index 7132eb2..32bb144 100755
--- a/setup/git/01_TestSetup.rb
+++ b/setup/git/01_TestSetup.rb
@@ -99,5 +99,5 @@ def install_from_git(host, package, repo, revision)
agents.each do |agent|
puppetconf = File.join(agent['puppetpath'], 'puppet.conf')
- on agent, "echo [agent] >> #{puppetconf} && echo server=#{role_master} >> #{puppetconf}"
+ on agent, "echo [agent] > #{puppetconf} && echo server=#{role_master} >> #{puppetconf}"
end
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
