summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Modulefile2
-rw-r--r--manifests/client.pp2
-rw-r--r--manifests/params.pp26
-rw-r--r--manifests/server.pp16
-rw-r--r--templates/server-default.conf.erb20
-rw-r--r--templates/server-hostname.conf.erb20
6 files changed, 53 insertions, 33 deletions
diff --git a/Modulefile b/Modulefile
index 6e27563..7fa162a 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
name 'saz-rsyslog'
-version '2.3.0'
+version '2.4.0'
source 'UNKNOWN'
author 'saz'
license 'Apache License, Version 2.0'
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,
}
diff --git a/templates/server-default.conf.erb b/templates/server-default.conf.erb
index fdf32d1..0c7f67f 100644
--- a/templates/server-default.conf.erb
+++ b/templates/server-default.conf.erb
@@ -8,15 +8,15 @@
<% if scope.lookupvar('rsyslog::server::enable_onefile') == false -%>
# Templates
-$Template dynAuthLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/auth.log"
-$Template dynSyslog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/syslog"
-$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/cron.log"
-$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/daemon.log"
-$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/kern.log"
-$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/user.log"
-$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/mail.log"
-$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/debug"
-$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages"
+$Template dynAuthLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>auth.log"
+$Template dynSyslog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>syslog"
+$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>cron.log"
+$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>daemon.log"
+$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>kern.log"
+$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>user.log"
+$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>mail.log"
+$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>debug"
+$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>messages"
# Rules
auth,authpriv.* ?dynAuthLog
@@ -32,7 +32,7 @@ user.* -?dynUserLog
mail.none,news.none -?dynMessages
<% else -%>
# Template
-$Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages"
+$Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= scope.lookupvar('rsyslog::server::logpath') -%>messages"
# Rules
*.* -?dynAllMessages
diff --git a/templates/server-hostname.conf.erb b/templates/server-hostname.conf.erb
index 2c2e75a..67158d9 100644
--- a/templates/server-hostname.conf.erb
+++ b/templates/server-hostname.conf.erb
@@ -7,15 +7,15 @@
<% if scope.lookupvar('rsyslog::server::enable_onefile') == false -%>
# Templates
-$Template dynAuthLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/auth.log"
-$Template dynSyslog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/syslog"
-$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/cron.log"
-$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/daemon.log"
-$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/kern.log"
-$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/user.log"
-$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/mail.log"
-$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/debug"
-$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/messages"
+$Template dynAuthLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>auth.log"
+$Template dynSyslog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>syslog"
+$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>cron.log"
+$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>daemon.log"
+$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>kern.log"
+$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>user.log"
+$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>mail.log"
+$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>debug"
+$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>messages"
# Rules
auth,authpriv.* ?dynAuthLog
@@ -31,7 +31,7 @@ user.* -?dynUserLog
mail.none,news.none -?dynMessages
<% else -%>
# Template
-$Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/messages"
+$Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%<%= scope.lookupvar('rsyslog::server::logpath') -%>messages"
# Rules
*.* -?dynAllMessages
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 16:58:00 +0000