Skip to content

Commit

Permalink
Merge pull request #1 from purplehazech/bug/master/no-default-puppet-…
Browse files Browse the repository at this point in the history
…conf

add puppet-agent conf (as default)

This pulls a basic puppet conf from stepping-stone/syslog-ng and uses the puppet-agent logpath as part of the default module config. This is done so users get a somewhat working setup out of the box.
It is expected that individual users override the logpaths anyhow so this should not affect any users directly.
  • Loading branch information
hairmare committed Jun 5, 2013
2 parents 37f7312 + adbd924 commit 5e33ec9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -79,6 +79,7 @@ If you want to show off all the logpaths, you would do that like so.
'postfix' => {},
'postgres' => {},
'provisioning' => {},
'puppet' => {},
'pure-ftpd' => {},
'racoon' => {},
'radiusd' => {},
Expand Down
6 changes: 5 additions & 1 deletion manifests/init.pp
Expand Up @@ -46,7 +46,10 @@
# [*logpaths*]
# Hash of logpaths to configure.
# Default:
# { 'syslog-ng' => {} }
# {
# 'syslog-ng' => {},
# 'puppet' => {},
# }
# See the README for a complete list of logpaths.
# [*destinations*]
# Hash of log destinations.
Expand Down Expand Up @@ -77,6 +80,7 @@
},
$logpaths = {
'syslog-ng' => {},
'puppet-agent' => {},
},
$destinations = {
'messages' => {},
Expand Down
5 changes: 5 additions & 0 deletions spec/classes/syslogng_spec.rb
Expand Up @@ -234,6 +234,11 @@
should contain_syslogng__logpath('syslog-ng').with({:ensure => 'present'})
}
end
context "define puppet-agent logpath" do
it {
should contain_syslogng__logpath('puppet-agent').with({:ensure => 'present'})
}
end
context "logpath config from param" do
let(:params) do
{
Expand Down

0 comments on commit 5e33ec9

Please sign in to comment.