diff options
author | mh <mh@immerda.ch> | 2010-11-30 00:38:41 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2010-11-30 00:38:41 +0100 |
commit | c414928502329b58045b4bfbf234b748a73ba84d (patch) | |
tree | 0be9d9ab61026eaa21de3fd168b39c66f9ba26cf | |
parent | bf9eb8ef613cc65c26eda754c8212b507fb8d9d6 (diff) | |
download | puppet-loginrecords-c414928502329b58045b4bfbf234b748a73ba84d.tar.gz puppet-loginrecords-c414928502329b58045b4bfbf234b748a73ba84d.tar.bz2 |
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.
-rw-r--r-- | manifests/btmp/disable.pp | 4 | ||||
-rw-r--r-- | manifests/btmp/enable.pp (renamed from manifests/btmp.pp) | 4 | ||||
-rw-r--r-- | manifests/faillog/disable.pp (renamed from manifests/faillog.pp) | 13 | ||||
-rw-r--r-- | manifests/faillog/enable.pp | 12 | ||||
-rw-r--r-- | manifests/init.pp | 2 | ||||
-rw-r--r-- | manifests/lastlog/disable.pp (renamed from manifests/lastlog.pp) | 0 | ||||
-rw-r--r-- | manifests/utmp/disable.pp | 3 | ||||
-rw-r--r-- | manifests/utmp/enable.pp (renamed from manifests/utmp.pp) | 4 | ||||
-rw-r--r-- | manifests/wtmp/disable.pp | 3 | ||||
-rw-r--r-- | manifests/wtmp/enable.pp (renamed from manifests/wtmp.pp) | 4 |
10 files changed, 22 insertions, 27 deletions
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.pp b/manifests/btmp/enable.pp index aa9c945..ea19e16 100644 --- a/manifests/btmp.pp +++ b/manifests/btmp/enable.pp @@ -1,7 +1,3 @@ -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/faillog.pp b/manifests/faillog/disable.pp index 2ec54c4..2e40ecf 100644 --- a/manifests/faillog.pp +++ b/manifests/faillog/disable.pp @@ -1,16 +1,3 @@ -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, 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/disable.pp index da6c735..da6c735 100644 --- a/manifests/lastlog.pp +++ b/manifests/lastlog/disable.pp 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.pp b/manifests/utmp/enable.pp index 3b79374..81e58ec 100644 --- a/manifests/utmp.pp +++ b/manifests/utmp/enable.pp @@ -1,7 +1,3 @@ -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/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.pp b/manifests/wtmp/enable.pp index 9988ef5..4982839 100644 --- a/manifests/wtmp.pp +++ b/manifests/wtmp/enable.pp @@ -1,7 +1,3 @@ -class loginrecords::wtmp::disable { - file { "$wtmp_file": ensure => 'absent' } -} - class loginrecords::wtmp::enable { file { "$wtmp_file": ensure => 'present', mode => 664, owner => 'root', group => 'utmp', |