lastlog improvements

* use class parameters
* clear lastlog content, so also old records are cleared

diff --git a/manifests/debian.pp b/manifests/debian.pp
index 56c5dca6dac9b27f7d8ee31bb04b4723e9e8673e..2df522fab0f6970d01dae5be8070c33c5a2abd3f 100644 (file)
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,6 +1,5 @@
 class loginrecords::debian inherits loginrecords::base {
 
-    $pam_login_file  = '/etc/pam.d/login'
     $login_defs_file = '/etc/login.defs'
     $btmp_file       = '/var/log/btmp'
     $utmp_file       = '/var/run/utmp'
@@ -19,7 +18,7 @@ class loginrecords::debian inherits loginrecords::base {
     }
 
     if $loginrecords::disable_lastlog {
-        include loginrecords::lastlog::disable
+        class{'loginrecords::lastlog::disable': }
     }
 
     if $loginrecords::disable_utmp {

diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp
index da6c735e2cf805a83cba81f2b0319b9f5fca5dbe..519195f5314dff900be35dfe854e8844936c4927 100644 (file)
--- a/manifests/lastlog/disable.pp
+++ b/manifests/lastlog/disable.pp
@@ -1,7 +1,13 @@
-class loginrecords::lastlog::disable {
-    replace { 'loginrecords-lastlog-disable':
-        file        => $pam_login_file,
-        pattern     => '^session[[:space:]]+optional[[:space:]]+pam_lastlog.so$',
-        replacement => '#session    optional   pam_lastlog.so',
-    }
+class loginrecords::lastlog::disable(
+  $pam_login_file = '/etc/pam.d/login'
+){
+  replace { 'loginrecords-lastlog-disable':
+    file    => $pam_login_file,
+    pattern   => '^session[[:space:]]+optional[[:space:]]+pam_lastlog.so$',
+    replacement => '#session  optional   pam_lastlog.so',
+  }
+  file{'/var/log/lastlog':
+    content => '',
+    owner => root, group => utmp, mode => 0664;
+  } 
 }