syslog: More comments, change name of default, notify syslog on changes

manifests/syslog.pp

+##############################################################################
+# Base syslog support
+##############################################################################
+#
+# This module uses rsyslog where possible otherwise syslog is used.
+#
+# The default rsyslog support preserves the use of /etc/syslog.conf.
+# The two most common overrides to this function are to not use
+# /etc/syslog.conf configuration and to not use the default configuration
+# that writes to /var/log/messages.  For example:
+#
+#  class s_ldap::conf::syslog-dev inherits base::syslog {
+#    Base::Syslog::Config::Rsyslog['/etc/rsyslog.conf'] {
+#      use_syslog_conf => false,
+#      use_default     => false,
+#    }
+#  }
+#
 #
 # Notes:
 # * the newsyslog service is responsible for ensuring the file permissions

manifests/syslog/config/rsyslog.pp

-# create rsyslog.conf
+##############################################################################
+# Create rsyslog.conf
+##############################################################################
+#
+# This define is used by the base::syslog module.
 
 define base::syslog::config::rsyslog(
-    $ensure          = 'present',
-    $source          = undef,
-    $owner           = 'root',
-    $group           = 'root',
-    $mode            = '0644',
-    $replace         = true,
-    $use_syslog_conf = true,
+  $ensure          = 'present',
+  $source          = undef,
+  $owner           = 'root',
+  $group           = 'root',
+  $mode            = '0644',
+  $replace         = true,
+  $use_syslog_conf = true,
+  $use_default     = true,
 ) {
 
-  if !$use_syslog_conf {
-    file {'/etc/rsyslog.d/90-local.conf':
-      ensure  => present,
-      source  => 'puppet:///modules/base/syslog/etc/rsyslog.d/90-local.conf',
-      owner   => $owner,
-      group   => $group,
-      mode    => $mode;
+  if !$use_syslog_conf and $use_default {
+    if $use_default {
+      file {'/etc/rsyslog.d/90-local-default.conf':
+        ensure  => present,
+        source  => 'puppet:///modules/base/syslog/etc/rsyslog.d/90-local-default.conf',
+        owner   => $owner,
+        group   => $group,
+        mode    => $mode,
+        notify  => Service['syslog'],
+      }
+    } else {
+      file {'/etc/rsyslog.d/90-local-default.conf':
+        ensure  => absent,
+        notify  => Service['syslog'],
+      }
     }
   }
 

manifests/syslog/fragment.pp

@@ -21,7 +21,7 @@
 #      ensure => present;
 #    '95-local.conf':
 #      ensure => present,
-#      source => 'puppet:///modules/s_audit/etc/rsyslog.d/95-local.conf',
+#      source => 'puppet:///modules/s_audit/etc/rsyslog.d/95-local.conf';
 #  }
 
 define base::syslog::fragment(