diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-05-26 20:50:12 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-05-26 20:50:12 -0300 |
| commit | 4c08bc30742a8d0f7ac6e7789b2b03ca897ea0e3 (patch) | |
| tree | ff205dee0443de338bec8e5b66f8bebaff5c6f0f | |
| parent | 533b8fbd9dfca345151f146f348496fc2a5fa530 (diff) | |
| parent | 2393966aa7a988daeffbc327540b985e7e8a166c (diff) | |
| download | puppet-loginrecords-4c08bc30742a8d0f7ac6e7789b2b03ca897ea0e3.tar.gz puppet-loginrecords-4c08bc30742a8d0f7ac6e7789b2b03ca897ea0e3.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-loginrecords
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | manifests/lastlog/disable.pp | 7 | ||||
| -rw-r--r-- | manifests/lastlog/enable.pp | 18 |
3 files changed, 13 insertions, 14 deletions
@@ -66,7 +66,7 @@ underlying /var/run directory. Copyright ========= -Copyright (c) 2010 intrigeri <intrigeri@boum.org> +Copyright (c) 2010-2013 intrigeri <intrigeri@boum.org> Licence ======= diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp index f97c49c..99830cf 100644 --- a/manifests/lastlog/disable.pp +++ b/manifests/lastlog/disable.pp @@ -1,8 +1,7 @@ -# disable lastlog loggin of pam +# disable lastlog logging of pam 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_line['loginrecords-lastlog']{ + line => '#session optional pam_lastlog.so', } File['/var/log/lastlog']{ ensure => absent, diff --git a/manifests/lastlog/enable.pp b/manifests/lastlog/enable.pp index b8dec35..cb6e8a6 100644 --- a/manifests/lastlog/enable.pp +++ b/manifests/lastlog/enable.pp @@ -2,15 +2,15 @@ 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_line{ 'loginrecords-lastlog': + path => $pam_login_file, + match => '^.*session[[:space:]]+optional[[:space:]]+pam_lastlog.so$', + line => 'session optional pam_lastlog.so', } - file{'/var/log/lastlog': - ensure => present, - owner => 'root', - group => 'utmp', - mode => '0664'; + file{ '/var/log/lastlog': + ensure => present, + owner => root, + group => utmp, + mode => '0664'; } } |