From 64ffadf9a76b4affe4ba69ab499fcdad1ccd76d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 16:39:23 +0100 Subject: Add back rsyslog::rsyslog_default_file --- manifests/config.pp | 2 +- manifests/params.pp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index d7fbbe6..dbb37cc 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_default', + source => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}", require => Class['rsyslog::install'], notify => Class['rsyslog::service'], } diff --git a/manifests/params.pp b/manifests/params.pp index 194d7ca..34544c5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,6 +24,7 @@ class rsyslog::params { $purge_rsyslog_d = false $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/default/rsyslog' + $default_config_file = 'rsyslog_default' $run_user = 'root' $run_group = 'root' $log_user = 'root' @@ -57,6 +58,7 @@ class rsyslog::params { $rsyslog_d = '/etc/rsyslog.d/' $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/sysconfig/rsyslog' + $default_config_file = 'rsyslog_default' $run_user = 'root' $run_group = 'root' $log_user = 'root' @@ -85,6 +87,7 @@ class rsyslog::params { $rsyslog_d = '/etc/syslog.d/' $rsyslog_conf = '/etc/syslog.conf' $rsyslog_default = '/etc/defaults/syslogd' + $default_config_file = 'rsyslog_default' $run_user = 'root' $run_group = 'wheel' $log_user = 'root' -- cgit v1.2.3