finish refactoring

refactor everything towards class parameters and also add enable
class for lastlog

diff --git a/manifests/btmp/disable.pp b/manifests/btmp/disable.pp
index 809c669354dd03572d7dc77768a83b849ff170c7..7a27126633a4a33c51e33bb37e141896a705d71c 100644 (file)
--- a/manifests/btmp/disable.pp
+++ b/manifests/btmp/disable.pp
@@ -1,4 +1,6 @@
-class loginrecords::btmp::disable {
-    file { "$btmp_file": ensure => 'absent' }
+class loginrecords::btmp::disable inherits loginrecords::btmp::enable {
+  File[$btmp_file]{
+    ensure => 'absent'
+  }
 }
 

diff --git a/manifests/btmp/enable.pp b/manifests/btmp/enable.pp
index ea19e16cfa732c12665d40036237b7cdaf9bf55e..c173362740156d578f633445cccd6c18b1f651b6 100644 (file)
--- a/manifests/btmp/enable.pp
+++ b/manifests/btmp/enable.pp
@@ -1,5 +1,8 @@
-class loginrecords::btmp::enable {
-    file { "$btmp_file":
-        ensure => 'present', mode => 660, owner => 'root', group => 'utmp',
-    }
+class loginrecords::btmp::enable(
+  $btmp_file = '/var/log/btmp'
+){
+  file{$btmp_file:
+    ensure => 'present',
+    owner => 'root', group => 'utmp', mode => 660;
+  }
 }

diff --git a/manifests/debian.pp b/manifests/debian.pp
index 2df522fab0f6970d01dae5be8070c33c5a2abd3f..12ec571909a0c8114bbda21c529401c0c42e9783 100644 (file)
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,36 +1,33 @@
 class loginrecords::debian inherits loginrecords::base {
 
-    $login_defs_file = '/etc/login.defs'
-    $btmp_file       = '/var/log/btmp'
-    $utmp_file       = '/var/run/utmp'
-    $wtmp_file       = '/var/log/wtmp'
+  if $loginrecords::disable_btmp {
+    class{'loginrecords::btmp::disable': }
+  } else {
+    class{'loginrecords::btmp::enable': }
+  }
 
-    if $loginrecords::disable_btmp {
-        include loginrecords::btmp::disable
-    } else {
-        include loginrecords::btmp::enable
-    }
+  if $loginrecords::disable_faillog {
+    class{'loginrecords::faillog::disable': }
+  } else {
+    class{'loginrecords::faillog::enable': }
+  }
 
-    if $loginrecords::disable_faillog {
-        include loginrecords::faillog::disable
-    } else {
-        include loginrecords::faillog::enable
-    }
+  if $loginrecords::disable_lastlog {
+    class{'loginrecords::lastlog::disable': }
+  } else {
+    class{'loginrecords::lastlog::enable': }
+  }
 
-    if $loginrecords::disable_lastlog {
-        class{'loginrecords::lastlog::disable': }
-    }
+  if $loginrecords::disable_utmp {
+    class{'loginrecords::utmp::disable': }
+  } else {
+    class{'loginrecords::utmp::enable': }
+  }
 
-    if $loginrecords::disable_utmp {
-        include loginrecords::utmp::disable
-    } else {
-        include loginrecords::utmp::enable
-    }
-
-    if $loginrecords::disable_wtmp {
-        include loginrecords::wtmp::disable
-    } else {
-        include loginrecords::wtmp::enable
-    }
+  if $loginrecords::disable_wtmp {
+    class{'loginrecords::wtmp::disable': }
+  } else {
+    class{'loginrecords::wtmp::enable': }
+  }
 
 }

diff --git a/manifests/faillog/disable.pp b/manifests/faillog/disable.pp
index a5d2dc56b8eb96a96cd95c869b2cf767511d6b9c..c05e6bc8797f1107a9d9c18fd00e612fc52da5c6 100644 (file)
--- a/manifests/faillog/disable.pp
+++ b/manifests/faillog/disable.pp
@@ -1,12 +1,9 @@
-class loginrecords::faillog::disable {
-    replace { 'loginrecords-faillog-disable':
-        file        => $login_defs_file,
-        pattern     => '^FAILLOG_ENAB[[:space:]]+yes$',
-        replacement => 'FAILLOG_ENAB           no',
-    }
-    line { 'loginrecords-faillog-disable':
-        file    => $login_defs_file,
-        line    => 'FAILLOG_ENAB               no',
-        require => Replace['loginrecords-faillog-disable'],
-    }
+class loginrecords::faillog::disable inherits loginrecords::faillog::enable{
+  Replace['loginrecords-faillog']{
+    pattern   => '^FAILLOG_ENAB[[:space:]]+yes$',
+    replacement => 'FAILLOG_ENAB               no',
+  }
+  Line['loginrecords-faillog']{
+    line  => 'FAILLOG_ENAB             no',
+  }
 }

diff --git a/manifests/faillog/enable.pp b/manifests/faillog/enable.pp
index f26dc699c06ee32073718c79a3059ae3793d3e24..c714b74e8139e78ef136eb35d206f27c374971c1 100644 (file)
--- a/manifests/faillog/enable.pp
+++ b/manifests/faillog/enable.pp
@@ -1,12 +1,14 @@
-class loginrecords::faillog::enable {
-    replace { 'loginrecords-faillog-enable':
-        file        => $login_defs_file,
-        pattern     => '^FAILLOG_ENAB[[:space]]+no$',
-        replacement => 'FAILLOG_ENAB           yes',
-    }
-    line { 'loginrecords-faillog-enable':
-        file    => $login_defs_file,
-        line    => 'FAILLOG_ENAB               yes',
-        require => Replace['loginrecords-faillog-enable'],
-    }
+class loginrecords::faillog::enable(
+  $login_defs_file = '/etc/login.defs'
+) {
+  replace{'loginrecords-faillog':
+    file    => $login_defs_file,
+    pattern   => '^FAILLOG_ENAB[[:space]]+no$',
+    replacement => 'FAILLOG_ENAB               yes',
+  }
+  line{'loginrecords-faillog':
+    file  => $login_defs_file,
+    line  => 'FAILLOG_ENAB             yes',
+    require => Replace['loginrecords-faillog'],
+  }
 }

diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp
index 519195f5314dff900be35dfe854e8844936c4927..e1434770eedd78c5d3b8977e808060589611ca91 100644 (file)
--- a/manifests/lastlog/disable.pp
+++ b/manifests/lastlog/disable.pp
@@ -1,13 +1,9 @@
-class loginrecords::lastlog::disable(
-  $pam_login_file = '/etc/pam.d/login'
-){
-  replace { 'loginrecords-lastlog-disable':
-    file    => $pam_login_file,
+class loginrecords::lastlog::disable inherits loginrecords::lastlog::enable {
+  Replace['loginrecords-lastlog']{
     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;
-  } 
+  File['/var/log/lastlog']{
+    ensure => absent,
+  }
 }

diff --git a/manifests/lastlog/enable.pp b/manifests/lastlog/enable.pp
new file mode 100644 (file)
index 0000000..bd9378b
--- /dev/null
+++ b/manifests/lastlog/enable.pp
@@ -0,0 +1,13 @@
+class loginrecords::lastlog::enable(
+  $pam_login_file = '/etc/pam.d/login'
+){
+  replace{'loginrecords-lastlog':
+    file => $pam_login_file,
+    pattern   => '^#session[[:space:]]+optional[[:space:]]+pam_lastlog.so$',
+    replacement => 'session  optional   pam_lastlog.so',
+  }
+  file{'/var/log/lastlog':
+    ensure => present,
+    owner => root, group => utmp, mode => 0664;
+  }
+}

diff --git a/manifests/utmp/disable.pp b/manifests/utmp/disable.pp
index 8d9145a560a3106ece76c6f1ac016ad1de3e4c54..5b4ce07e2fe857644fde0c3742e72e46b26cd966 100644 (file)
--- a/manifests/utmp/disable.pp
+++ b/manifests/utmp/disable.pp
@@ -1,3 +1,5 @@
-class loginrecords::utmp::disable {
-    file { "$utmp_file": ensure => 'absent' }
+class loginrecords::utmp::disable inherits loginrecords::utmp::enable {
+  File[$utmp_file]{
+    ensure => 'absent'
+  }
 }

diff --git a/manifests/utmp/enable.pp b/manifests/utmp/enable.pp
index 81e58ec9333be0d468ea367a97228fffa6b7e447..ee47b94fa44c1af352feb6440fc841125098de2b 100644 (file)
--- a/manifests/utmp/enable.pp
+++ b/manifests/utmp/enable.pp
@@ -1,5 +1,8 @@
-class loginrecords::utmp::enable {
-    file { "$utmp_file":
-        ensure => 'present', mode => 660, owner => 'root', group => 'utmp',
-    }
+class loginrecords::utmp::enable(
+  $utmp_file = '/var/run/utmp'
+){
+  file {$utmp_file:
+    ensure => 'present',
+    owner => 'root', group => 'utmp', mode => 660;
+  }
 }

diff --git a/manifests/wtmp/disable.pp b/manifests/wtmp/disable.pp
index c7c2b6d5343ffa7fd10d56da1a22b76d768894a9..c974cd986b3ffb9c44433fa27c09356b0240fec3 100644 (file)
--- a/manifests/wtmp/disable.pp
+++ b/manifests/wtmp/disable.pp
@@ -1,3 +1,5 @@
-class loginrecords::wtmp::disable {
-    file { "$wtmp_file": ensure => 'absent' }
+class loginrecords::wtmp::disable inherits loginrecords::wtmp::enable {
+  File[$wtmp_filer]{
+    ensure => 'absent'
+  }
 }

diff --git a/manifests/wtmp/enable.pp b/manifests/wtmp/enable.pp
index 49828390878af22f9016ff220653b4d47832147d..f3b5ee996fa678a98b9680f4d75fc91120e5bb37 100644 (file)
--- a/manifests/wtmp/enable.pp
+++ b/manifests/wtmp/enable.pp
@@ -1,5 +1,8 @@
-class loginrecords::wtmp::enable {
-    file { "$wtmp_file":
-        ensure => 'present', mode => 664, owner => 'root', group => 'utmp',
-    }
+class loginrecords::wtmp::enable(
+  $wtmp_file = '/var/log/wtmp'
+){
+  file{$wtmp_file:
+    ensure => 'present',
+    owner => 'root', group => 'utmp', mode => 664;
+  }
 }