diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | manifests/faillog/disable.pp | 6 | ||||
-rw-r--r-- | manifests/faillog/enable.pp | 13 |
3 files changed, 6 insertions, 15 deletions
@@ -11,7 +11,7 @@ Defaults to disable all supported login records. Dependencies ============ -- the common module: git://labs.riseup.net/shared-common +- the stdlib module from puppetlabs: http://forge.puppetlabs.com/puppetlabs/stdlib Configuration ============= diff --git a/manifests/faillog/disable.pp b/manifests/faillog/disable.pp index 4e1df4e..c55e39e 100644 --- a/manifests/faillog/disable.pp +++ b/manifests/faillog/disable.pp @@ -1,10 +1,6 @@ # do not log any faillog class loginrecords::faillog::disable inherits loginrecords::faillog::enable{ - Replace['loginrecords-faillog']{ - pattern => '^FAILLOG_ENAB[[:space:]]+yes$', - replacement => "FAILLOG_ENAB\tno", - } - Line['loginrecords-faillog']{ + File_line['loginrecords-faillog']{ line => "FAILLOG_ENAB\tno", } } diff --git a/manifests/faillog/enable.pp b/manifests/faillog/enable.pp index d600f6f..6120193 100644 --- a/manifests/faillog/enable.pp +++ b/manifests/faillog/enable.pp @@ -2,14 +2,9 @@ class loginrecords::faillog::enable( $login_defs_file = '/etc/login.defs' ) { - replace{'loginrecords-faillog': - file => $loginrecords::faillog::enable::login_defs_file, - pattern => '^FAILLOG_ENAB[[:space]]+no$', - replacement => "FAILLOG_ENAB\tyes", - } - line{'loginrecords-faillog': - file => $loginrecords::faillog::enable::login_defs_file, - line => "FAILLOG_ENAB\tyes", - require => Replace['loginrecords-faillog'], + file_line{'loginrecords-faillog': + path => $loginrecords::faillog::enable::login_defs_file, + match => '^FAILLOG_ENAB', + line => "FAILLOG_ENAB\tyes", } } |