aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-12-09 17:41:39 +0100
committermh <mh@immerda.ch>2010-12-09 17:41:49 +0100
commitc565f2877738b279d51ffb64e034e088785dca77 (patch)
tree25da897094443d262b6700ec3c63031b1527f9f8
parent588897cb1f04e70390c0ac726284f734c4ed7e80 (diff)
downloadpuppet-loginrecords-c565f2877738b279d51ffb64e034e088785dca77.tar.gz
puppet-loginrecords-c565f2877738b279d51ffb64e034e088785dca77.tar.bz2
lastlog improvements
* use class parameters * clear lastlog content, so also old records are cleared
-rw-r--r--manifests/debian.pp3
-rw-r--r--manifests/lastlog/disable.pp18
2 files changed, 13 insertions, 8 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 56c5dca..2df522f 100644
--- 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 da6c735..519195f 100644
--- 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;
+ }
}