summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/client.pp2
-rw-r--r--manifests/params.pp26
-rw-r--r--manifests/server.pp16
3 files changed, 32 insertions, 12 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index 4028b11..c563c71 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -46,7 +46,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 c1d2f71..1b19773 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',
@@ -45,7 +45,14 @@ class rsyslog::params {
$preserve_fqdn = false
}
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'
@@ -60,6 +67,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'
@@ -72,8 +80,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',
@@ -101,8 +109,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',
@@ -134,8 +142,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 beecde3..52bd8c5 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -38,15 +38,27 @@ class rsyslog::server (
$high_precision_timestamps = false,
$ssl_ca = undef,
$ssl_cert = undef,
- $ssl_key = undef
+ $ssl_key = undef,
+ $rotate = undef
) inherits rsyslog {
+ ### Logrotate policy
+ $logpath = $rotate ? {
+ 'year' => '/%$YEAR%/',
+ 'YEAR' => '/%$YEAR%/',
+ 'month' => '/%$YEAR%/%$MONTH%/',
+ 'MONTH' => '/%$YEAR%/%$MONTH%/',
+ 'day' => '/%$YEAR%/%$MONTH%/%$DAY%/',
+ 'DAY' => '/%$YEAR%/%$MONTH%/%$DAY%/',
+ default => '/',
+ }
+
$real_content = $custom_config ? {
'' => template("${module_name}/server-default.conf.erb"),
default => template($custom_config),
}
- rsyslog::snippet {'server':
+ rsyslog::snippet { $rsyslog::server_conf:
ensure => present,
content => $real_content,
}