introduce class parameters to make the interface nicer

diff --git a/README b/README
index 94571ec57b483a6612ec13b04b431e37485452b1..777aae7ee8e0ad1aed02daef97d9aa4f5d9b37d9 100644 (file)
--- a/README
+++ b/README
@@ -16,6 +16,10 @@ Dependencies
 Configuration
 =============
 
+You can set the following parameters for the loginrecords class.
+If you just include the class loginrecords this will disable all
+loginlogs.
+
 $disable_btmp, $disable_utmp, $disable_wtmp
 -------------------------------------------
 

diff --git a/manifests/debian.pp b/manifests/debian.pp
index cd729d6336d7b0b7448c14bed00d2d23d6b00c95..56c5dca6dac9b27f7d8ee31bb04b4723e9e8673e 100644 (file)
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -6,29 +6,29 @@ class loginrecords::debian inherits loginrecords::base {
     $utmp_file       = '/var/run/utmp'
     $wtmp_file       = '/var/log/wtmp'
 
-    if $disable_btmp {
+    if $loginrecords::disable_btmp {
         include loginrecords::btmp::disable
     } else {
         include loginrecords::btmp::enable
     }
 
-    if $disable_faillog {
+    if $loginrecords::disable_faillog {
         include loginrecords::faillog::disable
     } else {
         include loginrecords::faillog::enable
     }
 
-    if $disable_lastlog {
+    if $loginrecords::disable_lastlog {
         include loginrecords::lastlog::disable
     }
 
-    if $disable_utmp {
+    if $loginrecords::disable_utmp {
         include loginrecords::utmp::disable
     } else {
         include loginrecords::utmp::enable
     }
 
-    if $disable_wtmp {
+    if $loginrecords::disable_wtmp {
         include loginrecords::wtmp::disable
     } else {
         include loginrecords::wtmp::enable

diff --git a/manifests/init.pp b/manifests/init.pp
index 3bcf2741e0ff4066e3a233d6dd1ed3c7a3944223..9c0a8800233a33b3aa9d19c1ffa98bbf287fda1f 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,22 +1,10 @@
-class loginrecords {
-
-    # Default settings
-    if $disable_btmp == '' {
-        $disable_btmp = true
-    }
-    if $disable_faillog == '' {
-        $disable_faillog = true
-    }
-    if $disable_lastlog == '' {
-        $disable_lastlog = true
-    }
-    if $disable_utmp == '' {
-        $disable_utmp = true
-    }
-    if $disable_wtmp == '' {
-        $disable_wtmp = true
-    }
-
+class loginrecords(
+    $disable_btmp = true,
+    $disable_faillog = true,
+    $disable_lastlog = true,
+    $disable_utmp = true,
+    $disable_wtmp = true
+){
     # Include main class
     case $kernel {
         "Linux": {