summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorAaron Hicks <hicksa@landcareresearch.co.nz>2014-03-11 10:41:26 +1300
committerAaron Hicks <hicksa@landcareresearch.co.nz>2014-03-11 10:41:26 +1300
commit66a9354a3de1e1cf224ee098ed8a7b59f79079ae (patch)
tree39a9cdfdde5cd0acb13a455e44827f705770ef42 /manifests
parent4d51a536a444ae629743a2c25673b0db1d1d1ef9 (diff)
Define log templates with $template
Remove and update 'file managed by puppet' comment
Diffstat (limited to 'manifests')
-rw-r--r--manifests/client.pp2
-rw-r--r--manifests/snippet.pp2
2 files changed, 3 insertions, 1 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index dfc28e0..3cccff3 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -16,6 +16,7 @@
# [*port*]
# [*remote_servers*]
# [*ssl_ca*]
+# [*log_templates*]
# [*actionfiletemplate*]
#
# === Variables
@@ -36,6 +37,7 @@ class rsyslog::client (
$port = '514',
$remote_servers = false,
$ssl_ca = undef,
+ $log_templates = false,
$actionfiletemplate = false,
$preserve_fqdn = false
) inherits rsyslog {
diff --git a/manifests/snippet.pp b/manifests/snippet.pp
index bb0468e..9edf179 100644
--- a/manifests/snippet.pp
+++ b/manifests/snippet.pp
@@ -26,7 +26,7 @@ define rsyslog::snippet(
ensure => $ensure,
owner => $rsyslog::run_user,
group => $rsyslog::run_group,
- content => "# file managed by puppet\n${content}\n",
+ content => "# This file is managed by Puppet, changes may be overwritten\n${content}\n",
require => Class['rsyslog::config'],
notify => Class['rsyslog::service'],
}