summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Tamsen <tamsen@squareup.com>2014-04-01 10:27:15 -0700
committerDerek Tamsen <tamsen@squareup.com>2014-04-01 10:27:15 -0700
commit057e63d881b764075ac93ec4af55f11fd5b6f150 (patch)
treef077c6f2faafb9e8b6e8fa71d4434b1bcc1a2fa3
parenta4abb3df11a8cd46cfe1ee716c4d186725fbca36 (diff)
Using $rsyslog::client_conf var to generate rsyslog::client file name
-rw-r--r--manifests/client.pp2
-rw-r--r--manifests/params.pp8
2 files changed, 5 insertions, 5 deletions
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 = [