Merge tag '0.8.0'

Release 0.8.0

1 files changed, 12 insertions, 3 deletions

diff --git a/puppet/modules/leap/manifests/logfile.pp b/puppet/modules/leap/manifests/logfile.pp
index 63dbd16b..adb3ca8a 100644
--- a/puppet/modules/leap/manifests/logfile.pp
+++ b/puppet/modules/leap/manifests/logfile.pp
@@ -1,9 +1,18 @@
 #
 # make syslog log to a particular file for a particular process.
 #
-
-define leap::logfile($process=$name) {
-  $logfile = "/var/log/leap/${name}.log"
+# arguments:
+#
+#   * name: what config files are named as (eg.  /etc/rsyslog.d/50-$name.conf)
+#   * log: the full path of the log file (defaults to /var/log/leap/$name.log
+#   * process: the syslog tag to filter on (defaults to name)
+#
+define leap::logfile($process = $name, $log = undef) {
+  if $log {
+    $logfile = $log
+  } else {
+    $logfile = "/var/log/leap/${name}.log"
+  }
 
   rsyslog::snippet { "50-${name}":
     content => template('leap/rsyslog.erb')