diff options
| author | Steffen Zieger <me@saz.sh> | 2014-04-19 20:08:57 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-04-19 20:08:57 +0200 |
| commit | ac1d98877c9e658beb7d9b8577672504a0e0203f (patch) | |
| tree | d11eb7898275447d2023a7a7a8e36d01a50633cb | |
| parent | a4abb3df11a8cd46cfe1ee716c4d186725fbca36 (diff) | |
| parent | 6be920d084fe0d768404d71bbe9266757f583c6e (diff) | |
Merge pull request #65 from derektamsen/63_fix_client_conf_override_issue
fixes #63 client conf override issue
| -rw-r--r-- | manifests/client.pp | 2 | ||||
| -rw-r--r-- | manifests/params.pp | 16 | ||||
| -rw-r--r-- | manifests/server.pp | 2 |
3 files changed, 10 insertions, 10 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..5980106 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,8 +34,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -71,8 +71,8 @@ class rsyslog::params { $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -100,8 +100,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/syslog' $service_name = 'syslogd' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -133,8 +133,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', diff --git a/manifests/server.pp b/manifests/server.pp index beecde3..0496002 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -46,7 +46,7 @@ class rsyslog::server ( default => template($custom_config), } - rsyslog::snippet {'server': + rsyslog::snippet { $rsyslog::server_conf: ensure => present, content => $real_content, } |