From c414928502329b58045b4bfbf234b748a73ba84d Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 30 Nov 2010 00:38:41 +0100 Subject: get rid off import statement import statements are rather bad and with placing the code in the proper files we can get rid off the statement at all. --- manifests/btmp.pp | 9 --------- manifests/btmp/disable.pp | 4 ++++ manifests/btmp/enable.pp | 5 +++++ manifests/faillog.pp | 25 ------------------------- manifests/faillog/disable.pp | 12 ++++++++++++ manifests/faillog/enable.pp | 12 ++++++++++++ manifests/init.pp | 2 -- manifests/lastlog.pp | 7 ------- manifests/lastlog/disable.pp | 7 +++++++ manifests/utmp.pp | 9 --------- manifests/utmp/disable.pp | 3 +++ manifests/utmp/enable.pp | 5 +++++ manifests/wtmp.pp | 9 --------- manifests/wtmp/disable.pp | 3 +++ manifests/wtmp/enable.pp | 5 +++++ 15 files changed, 56 insertions(+), 61 deletions(-) delete mode 100644 manifests/btmp.pp create mode 100644 manifests/btmp/disable.pp create mode 100644 manifests/btmp/enable.pp delete mode 100644 manifests/faillog.pp create mode 100644 manifests/faillog/disable.pp create mode 100644 manifests/faillog/enable.pp delete mode 100644 manifests/lastlog.pp create mode 100644 manifests/lastlog/disable.pp delete mode 100644 manifests/utmp.pp create mode 100644 manifests/utmp/disable.pp create mode 100644 manifests/utmp/enable.pp delete mode 100644 manifests/wtmp.pp create mode 100644 manifests/wtmp/disable.pp create mode 100644 manifests/wtmp/enable.pp diff --git a/manifests/btmp.pp b/manifests/btmp.pp deleted file mode 100644 index aa9c945..0000000 --- a/manifests/btmp.pp +++ /dev/null @@ -1,9 +0,0 @@ -class loginrecords::btmp::disable { - file { "$btmp_file": ensure => 'absent' } -} - -class loginrecords::btmp::enable { - file { "$btmp_file": - ensure => 'present', mode => 660, owner => 'root', group => 'utmp', - } -} diff --git a/manifests/btmp/disable.pp b/manifests/btmp/disable.pp new file mode 100644 index 0000000..809c669 --- /dev/null +++ b/manifests/btmp/disable.pp @@ -0,0 +1,4 @@ +class loginrecords::btmp::disable { + file { "$btmp_file": ensure => 'absent' } +} + diff --git a/manifests/btmp/enable.pp b/manifests/btmp/enable.pp new file mode 100644 index 0000000..ea19e16 --- /dev/null +++ b/manifests/btmp/enable.pp @@ -0,0 +1,5 @@ +class loginrecords::btmp::enable { + file { "$btmp_file": + ensure => 'present', mode => 660, owner => 'root', group => 'utmp', + } +} diff --git a/manifests/faillog.pp b/manifests/faillog.pp deleted file mode 100644 index 2ec54c4..0000000 --- a/manifests/faillog.pp +++ /dev/null @@ -1,25 +0,0 @@ -class loginrecords::faillog::enable { - replace { 'loginrecords-faillog-enable': - file => $login_defs_file, - pattern => '^FAILLOG_ENAB[[:space]]+no$', - replacement => 'FAILLOG_ENAB yes', - } - append_if_no_such_line { 'loginrecords-faillog-enable': - file => $login_defs_file, - line => 'FAILLOG_ENAB yes', - require => Replace['loginrecords-faillog-enable'], - } -} - -class loginrecords::faillog::disable { - replace { 'loginrecords-faillog-disable': - file => $login_defs_file, - pattern => '^FAILLOG_ENAB[[:space:]]+yes$', - replacement => 'FAILLOG_ENAB no', - } - append_if_no_such_line { 'loginrecords-faillog-disable': - file => $login_defs_file, - line => 'FAILLOG_ENAB no', - require => Replace['loginrecords-faillog-disable'], - } -} diff --git a/manifests/faillog/disable.pp b/manifests/faillog/disable.pp new file mode 100644 index 0000000..2e40ecf --- /dev/null +++ b/manifests/faillog/disable.pp @@ -0,0 +1,12 @@ +class loginrecords::faillog::disable { + replace { 'loginrecords-faillog-disable': + file => $login_defs_file, + pattern => '^FAILLOG_ENAB[[:space:]]+yes$', + replacement => 'FAILLOG_ENAB no', + } + append_if_no_such_line { 'loginrecords-faillog-disable': + file => $login_defs_file, + line => 'FAILLOG_ENAB no', + require => Replace['loginrecords-faillog-disable'], + } +} diff --git a/manifests/faillog/enable.pp b/manifests/faillog/enable.pp new file mode 100644 index 0000000..ebc8922 --- /dev/null +++ b/manifests/faillog/enable.pp @@ -0,0 +1,12 @@ +class loginrecords::faillog::enable { + replace { 'loginrecords-faillog-enable': + file => $login_defs_file, + pattern => '^FAILLOG_ENAB[[:space]]+no$', + replacement => 'FAILLOG_ENAB yes', + } + append_if_no_such_line { 'loginrecords-faillog-enable': + file => $login_defs_file, + line => 'FAILLOG_ENAB yes', + require => Replace['loginrecords-faillog-enable'], + } +} diff --git a/manifests/init.pp b/manifests/init.pp index b2d063b..3bcf274 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,3 @@ -import "*.pp" - class loginrecords { # Default settings diff --git a/manifests/lastlog.pp b/manifests/lastlog.pp deleted file mode 100644 index da6c735..0000000 --- a/manifests/lastlog.pp +++ /dev/null @@ -1,7 +0,0 @@ -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', - } -} diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp new file mode 100644 index 0000000..da6c735 --- /dev/null +++ b/manifests/lastlog/disable.pp @@ -0,0 +1,7 @@ +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', + } +} diff --git a/manifests/utmp.pp b/manifests/utmp.pp deleted file mode 100644 index 3b79374..0000000 --- a/manifests/utmp.pp +++ /dev/null @@ -1,9 +0,0 @@ -class loginrecords::utmp::disable { - file { "$utmp_file": ensure => 'absent' } -} - -class loginrecords::utmp::enable { - file { "$utmp_file": - ensure => 'present', mode => 660, owner => 'root', group => 'utmp', - } -} diff --git a/manifests/utmp/disable.pp b/manifests/utmp/disable.pp new file mode 100644 index 0000000..8d9145a --- /dev/null +++ b/manifests/utmp/disable.pp @@ -0,0 +1,3 @@ +class loginrecords::utmp::disable { + file { "$utmp_file": ensure => 'absent' } +} diff --git a/manifests/utmp/enable.pp b/manifests/utmp/enable.pp new file mode 100644 index 0000000..81e58ec --- /dev/null +++ b/manifests/utmp/enable.pp @@ -0,0 +1,5 @@ +class loginrecords::utmp::enable { + file { "$utmp_file": + ensure => 'present', mode => 660, owner => 'root', group => 'utmp', + } +} diff --git a/manifests/wtmp.pp b/manifests/wtmp.pp deleted file mode 100644 index 9988ef5..0000000 --- a/manifests/wtmp.pp +++ /dev/null @@ -1,9 +0,0 @@ -class loginrecords::wtmp::disable { - file { "$wtmp_file": ensure => 'absent' } -} - -class loginrecords::wtmp::enable { - file { "$wtmp_file": - ensure => 'present', mode => 664, owner => 'root', group => 'utmp', - } -} diff --git a/manifests/wtmp/disable.pp b/manifests/wtmp/disable.pp new file mode 100644 index 0000000..c7c2b6d --- /dev/null +++ b/manifests/wtmp/disable.pp @@ -0,0 +1,3 @@ +class loginrecords::wtmp::disable { + file { "$wtmp_file": ensure => 'absent' } +} diff --git a/manifests/wtmp/enable.pp b/manifests/wtmp/enable.pp new file mode 100644 index 0000000..4982839 --- /dev/null +++ b/manifests/wtmp/enable.pp @@ -0,0 +1,5 @@ +class loginrecords::wtmp::enable { + file { "$wtmp_file": + ensure => 'present', mode => 664, owner => 'root', group => 'utmp', + } +} -- cgit v1.2.3