diff options
| author | William Hopper <whopper@cat.pdx.edu> | 2012-03-13 01:52:24 -0700 |
|---|---|---|
| committer | William Hopper <whopper@cat.pdx.edu> | 2012-03-13 02:00:01 -0700 |
| commit | bf31d6d4bb027c35c6b3ec101f9f6c99f79aa54f (patch) | |
| tree | db4c880e93a0f369bf51e59fda298567ca7d01be /manifests | |
| parent | 3ebd73b9fdcdd0e6131376f0319a139e2fa8957c (diff) | |
Updating formatting to meet Puppet Labs best practices
Signed-off-by: William Hopper <whopper@cat.pdx.edu>
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client.pp | 10 | ||||
| -rw-r--r-- | manifests/params.pp | 18 | ||||
| -rw-r--r-- | manifests/server.pp | 9 |
3 files changed, 26 insertions, 11 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 6b71e9e..7af38ec 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,4 +1,12 @@ -class rsyslog::client ($log_remote = true, $remote_type = 'tcp', $log_local = false, $log_auth_local = false, $custom_config = undef, $server = 'log') inherits rsyslog { +class rsyslog::client ( + $log_remote = true, + $remote_type = 'tcp', + $log_local = false, + $log_auth_local = false, + $custom_config = undef, + $server = 'log' +) inherits rsyslog { + file { $rsyslog::params::client_conf: ensure => present, owner => root, diff --git a/manifests/params.pp b/manifests/params.pp index 24426ad..cb6b1b2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,15 +1,15 @@ class rsyslog::params { case $::operatingsystem { ubuntu, debian: { - $rsyslog_package_name = 'rsyslog' - $relp_package_name = 'rsyslog-relp' - $rsyslog_d = '/etc/rsyslog.d/' - $rsyslog_conf = '/etc/rsyslog.conf' - $rsyslog_default = '/etc/default/rsyslog' - $spool_dir = '/var/spool/rsyslog/' - $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $rsyslog_package_name = 'rsyslog' + $relp_package_name = 'rsyslog-relp' + $rsyslog_d = '/etc/rsyslog.d/' + $rsyslog_conf = '/etc/rsyslog.conf' + $rsyslog_default = '/etc/default/rsyslog' + $spool_dir = '/var/spool/rsyslog/' + $service_name = 'rsyslog' + $client_conf = "${rsyslog_d}client.conf" + $server_conf = "${rsyslog_d}server.conf" } default: { fail("Unsupported platform: ${::operatingsystem}") diff --git a/manifests/server.pp b/manifests/server.pp index adc868e..c714bd1 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -1,4 +1,11 @@ -class rsyslog::server ($enable_tcp = true, $enable_udp = true, $server_dir = '/srv/log/', $custom_config = undef, $high_precision_timestamps = false) inherits rsyslog { +class rsyslog::server ( + $enable_tcp = true, + $enable_udp = true, + $server_dir = '/srv/log/', + $custom_config = undef, + $high_precision_timestamps = false +) inherits rsyslog { + file { $rsyslog::params::server_conf: ensure => present, owner => root, |