Small cleanups and fixes

README.md

@@ -30,7 +30,7 @@ This module will manage the pattern databases of *syslog-ng* by using existing f
 
 Depending on the top-level configuration variables `$base_dir` and `$temp_dir`, this module will manage and execute the following elements in order:
 
-0. (OPTIONAL) Manage package `syslog-ng`
+0. (OPTIONAL) Manage package `syslog-ng` and remove the default syslog daemon (usually rsyslog)
 1. Manage `$base_dir/etc/syslog-ng/patterndb.d` recursively
 2. Manage the contents of the above directory using [existing](#defined-type-patterndbrawruleset) or [generated](#defined-type-patterndbsimpleruleset) patterndb *ruleset* files
 3. Merge the contents of the latter using `pdbtool` into a temporary file `${temp_dir}/syslog-ng/patterndb/${parser}.xml` where `$parser` is the name of the *patterndb* (you can have as many as you want, *e.g.* for *staged parsing*.

manifests/init.pp

@@ -14,16 +14,9 @@
   validate_array($syslogng_modules)
 # package
   if $manage_package {
-    if is_string($package_name) {
-      $real_package_name = $package_name
-    } else {
-      case $::osfamily {
-        'RedHat': { $real_package_name = 'syslog-ng' }
-        'Debian': { $real_package_name = 'syslog-ng' }
-        default: { fail("unsupported osfamily: ${::osfamily}") }
-      }
+    class { '::patterndb::install':
+        package_name => $package_name,
     }
-    ensure_resource ( 'package', $real_package_name, { 'ensure' => 'installed' })
   }
   ensure_resource ( 'file', $temp_dir, { ensure => directory } )
   ensure_resource ( 'file', "${base_dir}/etc", { ensure => 'directory' } )

manifests/install.pp

@@ -0,0 +1,24 @@
+#
+# == Class: patterndb::install
+#
+# Ensure that the default syslog is uninstalled and that syslog-ng is installed.
+#
+class patterndb::install (
+    $package_name
+) inherits patterndb::params
+{
+  if is_string($package_name) {
+    $real_package_name = $package_name
+  } else {
+    $real_package_name = $::patterndb::params::syslog_ng_package_name
+  }
+
+  package { $::patterndb::params::default_syslog_package_name:
+    ensure => absent,
+  }
+
+  package { $real_package_name:
+    ensure => installed,
+    require => Package[$::patterndb::params::default_syslog_package_name],
+  }
+}

manifests/params.pp

@@ -0,0 +1,21 @@
+#
+# == Class: patterndb::params
+#
+# Defines some variables based on the operating system
+#
+class patterndb::params {
+
+  case $::osfamily {
+    'RedHat': {
+      $syslog_ng_package_name = 'syslog-ng'
+      $default_syslog_package_name = 'rsyslog'
+    }
+    'Debian': {
+      $syslog_ng_package_name = 'syslog-ng'
+      $default_syslog_package_name = 'rsyslog'
+    }
+    default: {
+      fail("Unsupported operating system ${::osfamily}")
+    }
+  }
+}

manifests/parser.pp

@@ -4,10 +4,10 @@
   $syslogng_modules = $::patterndb::syslogng_modules
 ) {
   if ! defined(Class['Patterndb']) {
-    include patterndb
+    include ::patterndb
   }
   if empty($syslogng_modules) {
-    $modules = ''
+    $modules = undef
   } else {
     $tmp = join($syslogng_modules,' --module=')
     $modules = "--module=${tmp}"

manifests/raw/ruleset.pp

@@ -16,7 +16,7 @@
   validate_bool($recurse)
 
   if ! defined(Class['Patterndb']) {
-    include patterndb
+    include ::patterndb
   }
 
   if ! defined(Patterndb::Parser[$parser]) {

manifests/simple/ruleset.pp

@@ -11,7 +11,7 @@
 ) {
 
   if ! defined(Class['Patterndb']) {
-    include patterndb
+    include ::patterndb
   }
 
   $patterns_a = string2array($patterns)

smoke/NOK_mismatching_action.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_getent.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/',
   syslogng_modules => [ 'tfgetent' ]
 }

smoke/OK_hybrid.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_modules.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/',
   syslogng_modules => [ 'basicfuncs' ]
 }

smoke/OK_multiple_pdb.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_notest.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/',
   syslogng_modules => [ 'pdbtool_test_would_fail_with_this_module' ],
   test_before_deploy => false

smoke/OK_raw.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/',
   syslogng_modules => ['tfgetent']
 }

smoke/OK_s.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_separate_action.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_separate_rules.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_separate_rules_and_actions.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_simple.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_simple_action.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_simple_coerce.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_simple_context.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_simple_empty.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp/'
 }
 

smoke/OK_yum.pp

@@ -1,5 +1,5 @@
 #
-class { 'patterndb':
+class { '::patterndb':
   base_dir => '/tmp',
   syslogng_modules => [ 'tfgeoip', 'tfgetent' ],
   test_before_deploy => true,