bugfixes

diff --git a/manifests/faillog.pp b/manifests/faillog.pp
index 2af2299b01be011a1e5bb13824e332b2bf8b316e..2ec54c4191a19c80abf103c758a4b9b2ff1a1856 100644 (file)
--- a/manifests/faillog.pp
+++ b/manifests/faillog.pp
@@ -1,8 +1,8 @@
 class loginrecords::faillog::enable {
     replace { 'loginrecords-faillog-enable':
-        file    => $login_defs_file,
-        pattern => '^FAILLOG_ENAB\w+no$',
-        replace => 'FAILLOG_ENAB               yes',
+        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,
@@ -12,14 +12,14 @@ class loginrecords::faillog::enable {
 }
 
 class loginrecords::faillog::disable {
-        replace { 'loginrecords-faillog-disable':
-            file => $login_defs_file,
-            pattern => '^FAILLOG_ENAB\w+yes$',
-            replace => 'FAILLOG_ENAB           no',
-        }
-        append_if_no_such_line { 'loginrecords-faillog-disable':
-            file    => $login_defs_file,
-            line    => 'FAILLOG_ENAB           no',
-            require => Replace['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/init.pp b/manifests/init.pp
index 2eddcb3248b789d19ae3cd19faa62cb9fa41a494..69b6d1bdbd5b55a3b8f49398a7ba2e2882eaee5e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,3 +1,5 @@
+import "*.pp"
+
 class loginrecords {
 
     # Default settings