From f68d343d48aaffb1baa6cdd951c8cfd2553b1edf Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 4 Jan 2013 20:04:27 +0100 Subject: use file_line --- manifests/lastlog/disable.pp | 6 +++--- manifests/lastlog/enable.pp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp index f97c49c..605f365 100644 --- a/manifests/lastlog/disable.pp +++ b/manifests/lastlog/disable.pp @@ -1,8 +1,8 @@ # disable lastlog loggin 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']{ + match => '^session[[:space:]]+optional[[:space:]]+pam_lastlog.so$', + 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..602d679 100644 --- a/manifests/lastlog/enable.pp +++ b/manifests/lastlog/enable.pp @@ -2,10 +2,10 @@ 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, -- cgit v1.2.3 From 880c31845777c19d76ada11fb68a67a016ae204b Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 4 Jan 2013 20:29:20 +0100 Subject: fix matching --- manifests/lastlog/disable.pp | 1 - manifests/lastlog/enable.pp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp index 605f365..c6836d0 100644 --- a/manifests/lastlog/disable.pp +++ b/manifests/lastlog/disable.pp @@ -1,7 +1,6 @@ # disable lastlog loggin of pam class loginrecords::lastlog::disable inherits loginrecords::lastlog::enable { File_line['loginrecords-lastlog']{ - match => '^session[[:space:]]+optional[[:space:]]+pam_lastlog.so$', line => '#session optional pam_lastlog.so', } File['/var/log/lastlog']{ diff --git a/manifests/lastlog/enable.pp b/manifests/lastlog/enable.pp index 602d679..782efe7 100644 --- a/manifests/lastlog/enable.pp +++ b/manifests/lastlog/enable.pp @@ -4,7 +4,7 @@ class loginrecords::lastlog::enable( ){ file_line{'loginrecords-lastlog': path => $pam_login_file, - match => '^#session[[:space:]]+optional[[:space:]]+pam_lastlog.so$', + match => '^.*session[[:space:]]+optional[[:space:]]+pam_lastlog.so$', line => 'session optional pam_lastlog.so', } file{'/var/log/lastlog': -- cgit v1.2.3 From 737079e7e0681a09b8a3cc1bbdd2a82bfd01609b Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 6 May 2013 14:59:23 +0200 Subject: Linting. --- manifests/lastlog/enable.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/lastlog/enable.pp b/manifests/lastlog/enable.pp index 782efe7..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' ){ - file_line{'loginrecords-lastlog': - path => $pam_login_file, - match => '^.*session[[:space:]]+optional[[:space:]]+pam_lastlog.so$', - line => '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'; } } -- cgit v1.2.3 From d8d132105706a5d73f4decf1e9ee28616a74d635 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 6 May 2013 14:59:27 +0200 Subject: Fix typo. --- manifests/lastlog/disable.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/lastlog/disable.pp b/manifests/lastlog/disable.pp index c6836d0..99830cf 100644 --- a/manifests/lastlog/disable.pp +++ b/manifests/lastlog/disable.pp @@ -1,4 +1,4 @@ -# disable lastlog loggin of pam +# disable lastlog logging of pam class loginrecords::lastlog::disable inherits loginrecords::lastlog::enable { File_line['loginrecords-lastlog']{ line => '#session optional pam_lastlog.so', -- cgit v1.2.3 From 2393966aa7a988daeffbc327540b985e7e8a166c Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 6 May 2013 15:01:14 +0200 Subject: Update copyright years. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index d5acff3..eb4b0db 100644 --- a/README +++ b/README @@ -66,7 +66,7 @@ underlying /var/run directory. Copyright ========= -Copyright (c) 2010 intrigeri +Copyright (c) 2010-2013 intrigeri Licence ======= -- cgit v1.2.3