diff options
| author | Ralf Heiringhoff <ralf.heiringhoff@1und1.de> | 2012-09-24 19:13:55 +0200 |
|---|---|---|
| committer | Ralf Heiringhoff <ralf.heiringhoff@1und1.de> | 2012-09-24 19:13:55 +0200 |
| commit | 9694d36067d83d1aa25e2ae9e78326c801e64e10 (patch) | |
| tree | d154a40a2fe00a9f0febe230be36a89004652315 | |
| parent | d29c3351dc7105c41a18767e72b541e30157e239 (diff) | |
| parent | 44cab6234a0b885677f68f3c162a75ef2dd6f3ab (diff) | |
Merge branch 'saz' into Add_Disk_Spool_Size_Queueing_Params
| -rw-r--r-- | manifests/params.pp | 15 | ||||
| -rw-r--r-- | templates/client.conf.erb | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 5e08812..beac031 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,6 +1,6 @@ class rsyslog::params { - case $::operatingsystem { - ubuntu, debian: { + case $::osfamily { + debian: { $rsyslog_package_name = 'rsyslog' $relp_package_name = 'rsyslog-relp' $package_status = 'latest' @@ -20,7 +20,7 @@ class rsyslog::params { $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" } - redhat, centos, fedora: { + redhat: { $rsyslog_package_name = 'rsyslog' $relp_package_name = 'rsyslog-relp' $package_status = 'latest' @@ -60,11 +60,12 @@ class rsyslog::params { $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" } - - default: { - fail("Unsupported platform: ${::operatingsystem}") + case $::operatingsystem { + default: { + fail("Unsupported platform: ${::operatingsystem}") + } + } } } - } diff --git a/templates/client.conf.erb b/templates/client.conf.erb index aa96cfe..38af6af 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -21,17 +21,17 @@ $ActionResumeRetryCount -1 # infinety retries if host is down # We log locally, restore to default format $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat -<% if scope.lookupvar('rsyslog::client::log_style') == 'debian' -%> +<% if scope.lookupvar('rsyslog::params::log_style') == 'debian' -%> # Log auth messages locally auth,authpriv.* /var/log/auth.log -<% elsif scope.lookupvar('rsyslog::client::log_style') == 'redhat' -%> +<% elsif scope.lookupvar('rsyslog::params::log_style') == 'redhat' -%> # Log auth messages locally auth,authpriv.* /var/log/secure <% end -%> <% end -%> <% if scope.lookupvar('rsyslog::client::log_local') -%> -<% if scope.lookupvar('rsyslog::client::log_os_style') == 'debian' -%> +<% if scope.lookupvar('rsyslog::params::log_style') == 'debian' -%> # First some standard log files. Log by facility. # *.*;auth,authpriv.none -/var/log/syslog @@ -89,7 +89,7 @@ daemon.*;mail.*;\ news.err;\ *.=debug;*.=info;\ *.=notice;*.=warn |/dev/xconsole -<% elsif scope.lookupvar('rsyslog::client::log_os_style') == 'redhat' -%> +<% elsif scope.lookupvar('rsyslog::params::log_style') == 'redhat' -%> # Log all kernel messages to the console. # Logging much else clutters up the screen. #kern.* /dev/console |