tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added $syslog_group support to syslog::standalone

Browse source
This commit is contained in:
Timo Mkinen 2011-08-31 12:05:10 +03:00
parent bbf1e6a22b
commit 3ba3bc2842
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
syslog/manifests/init.pp
View file

@ -121,6 +121,10 @@ class syslog::client::rsyslog {
# $syslog_datadir: # $syslog_datadir:
# Directory where to store logs. Defaults to /srv/log. # Directory where to store logs. Defaults to /srv/log.
# #
# $syslog_group:
# Group name which has permissions to read logs. Defaults to
# wheel or root depending on operating system.
#
class syslog::standalone { class syslog::standalone {
if !$syslog_type { if !$syslog_type {
@ -132,46 +136,44 @@ class syslog::standalone {
} }
} }
if $syslog_group {
$group = $syslog_group
} else {
if $operatingsystem == "OpenBSD" {
$group = "wheel"
} else {
$group = "root"
}
}
if $syslog_datadir { if $syslog_datadir {
file { $syslog_datadir: file { $syslog_datadir:
ensure => directory, ensure => directory,
mode => 0750, mode => 2750,
owner => "root", owner => "root",
group => $operatingsystem ? { group => $group,
"openbsd" => "wheel",
default => "root",
},
} }
file { "/srv/log": file { "/srv/log":
ensure => link, ensure => link,
target => $syslog_datadir, target => $syslog_datadir,
owner => "root", owner => "root",
group => $operatingsystem ? { group => $group,
"openbsd" => "wheel",
default => "root",
},
require => File[$syslog_datadir], require => File[$syslog_datadir],
} }
} else { } else {
file { "/srv/log": file { "/srv/log":
ensure => directory, ensure => directory,
mode => 0755, mode => 2750,
owner => "root", owner => "root",
group => $operatingsystem ? { group => $group,
"openbsd" => "wheel",
default => "root",
},
} }
} }
file { "/srv/log/archive": file { "/srv/log/archive":
ensure => directory, ensure => directory,
mode => 0755, mode => 2750,
owner => "root", owner => "root",
group => $operatingsystem ? { group => $group,
"openbsd" => "wheel",
default => "root",
},
require => File["/srv/log"], require => File["/srv/log"],
} }