diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client.pp | 2 | ||||
| -rw-r--r-- | manifests/params.pp | 26 | ||||
| -rw-r--r-- | manifests/server.pp | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 3cccff3..b5fa04b 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -47,7 +47,7 @@ class rsyslog::client ( default => template($custom_config),
}
- rsyslog::snippet {'client':
+ rsyslog::snippet { $rsyslog::client_conf:
ensure => present,
content => $content_real,
}
diff --git a/manifests/params.pp b/manifests/params.pp index 5bf75cf..b00908a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,8 +34,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -44,7 +44,14 @@ class rsyslog::params { ] } redhat: { - if $::operatingsystemrelease >= 6.0 { + if $::operatingsystem == 'Amazon' { + $rsyslog_package_name = 'rsyslog' + $mysql_package_name = 'rsyslog-mysql' + $pgsql_package_name = 'rsyslog-pgsql' + $gnutls_package_name = 'rsyslog-gnutls' + $relp_package_name = false + } + elsif $::operatingsystemrelease >= 6.0 { $rsyslog_package_name = 'rsyslog' $mysql_package_name = 'rsyslog-mysql' $pgsql_package_name = 'rsyslog-pgsql' @@ -59,6 +66,7 @@ class rsyslog::params { } $package_status = 'latest' $rsyslog_d = '/etc/rsyslog.d/' + $purge_rsyslog_d = false $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/sysconfig/rsyslog' $default_config_file = 'rsyslog_default' @@ -71,8 +79,8 @@ class rsyslog::params { $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -100,8 +108,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/syslog' $service_name = 'syslogd' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -133,8 +141,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', diff --git a/manifests/server.pp b/manifests/server.pp index 8baf270..52bd8c5 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -58,7 +58,7 @@ class rsyslog::server ( default => template($custom_config), } - rsyslog::snippet {'server': + rsyslog::snippet { $rsyslog::server_conf: ensure => present, content => $real_content, } |