summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2014-09-17 11:11:45 -0400
committerMicah Anderson <micah@riseup.net>2014-09-17 11:11:45 -0400
commitb8ef11c23949d12732ad5cdaebb3023ff39a297a (patch)
tree69305f1afb350e2d3956b0c8767c3a70cde7c7e6
parente6dddeec8b71cda20d3a682af7b973e3027f4f01 (diff)
Move default file to template to take advantage of rsyslog_version fact and different flags available pre version 7 - Fixes #61HEADmaster
-rw-r--r--manifests/config.pp2
-rw-r--r--templates/rsyslog_default.erb (renamed from files/rsyslog_default)2
-rw-r--r--templates/rsyslog_default_gentoo.erb (renamed from files/rsyslog_default_gentoo)0
-rw-r--r--templates/rsyslog_default_rhel7.erb (renamed from files/rsyslog_default_rhel7)0
4 files changed, 3 insertions, 1 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 813e784..1aebe47 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -34,7 +34,7 @@ class rsyslog::config {
ensure => file,
owner => 'root',
group => $rsyslog::run_group,
- source => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}",
+ content => template("${module_name}/${rsyslog::rsyslog_default_file}.erb"),
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
}
diff --git a/files/rsyslog_default b/templates/rsyslog_default.erb
index 1f11cd3..a49eb59 100644
--- a/files/rsyslog_default
+++ b/templates/rsyslog_default.erb
@@ -1,7 +1,9 @@
# File is managed by puppet
+<% if @rsyslog_version and @rsyslog_version.split('.')[0].to_i < 7 -%>
# Debian, Ubuntu
RSYSLOGD_OPTIONS="-c4"
+<% end -%>
# CentOS, RedHat, Fedora
SYSLOGD_OPTIONS="${RSYSLOGD_OPTIONS}"
diff --git a/files/rsyslog_default_gentoo b/templates/rsyslog_default_gentoo.erb
index f5de7b5..f5de7b5 100644
--- a/files/rsyslog_default_gentoo
+++ b/templates/rsyslog_default_gentoo.erb
diff --git a/files/rsyslog_default_rhel7 b/templates/rsyslog_default_rhel7.erb
index c3b95c7..c3b95c7 100644
--- a/files/rsyslog_default_rhel7
+++ b/templates/rsyslog_default_rhel7.erb