From 057e63d881b764075ac93ec4af55f11fd5b6f150 Mon Sep 17 00:00:00 2001 From: Derek Tamsen Date: Tue, 1 Apr 2014 10:27:15 -0700 Subject: Using $rsyslog::client_conf var to generate rsyslog::client file name --- manifests/client.pp | 2 +- manifests/params.pp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'manifests') diff --git a/manifests/client.pp b/manifests/client.pp index 3cccff3..b5fa04b 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -47,7 +47,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 5bf75cf..51f5154 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,7 +34,7 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" + $client_conf = 'client' $server_conf = "${rsyslog_d}server.conf" $ssl = false $modules = [ @@ -71,7 +71,7 @@ class rsyslog::params { $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" + $client_conf = 'client' $server_conf = "${rsyslog_d}server.conf" $ssl = false $modules = [ @@ -100,7 +100,7 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/syslog' $service_name = 'syslogd' - $client_conf = "${rsyslog_d}client.conf" + $client_conf = 'client' $server_conf = "${rsyslog_d}server.conf" $ssl = false $modules = [ @@ -133,7 +133,7 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" + $client_conf = 'client' $server_conf = "${rsyslog_d}server.conf" $ssl = false $modules = [ -- cgit v1.2.3