Merge pull request #19 from jordiprats/master

basic ubuntu 18

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.1.16
+
+* added ensure to **pam::securetty**
+* basic Ubuntu 18.04 support
+
 ## 0.1.15
 
 * added ensure to **pam::ttyaudit**

README.md

@@ -21,6 +21,8 @@ PAM modules, /etc/security/limits.conf and /etc/securetty management
 
 ## Module Description
 
+PAM module management for RHEL and derivatives, partial support for Ubuntu
+
 ### pam::lockout
 
 CIS compliance using pam_faillock for CentOS 6 and 7:
@@ -132,7 +134,7 @@ All items support the values -1, unlimited or infinity indicating no limit, exce
 
 ## Limitations
 
-This is where you list OS compatibility, version compatibility, etc.
+* Partial Ubuntu support
 
 ## Development
 
@@ -141,7 +143,7 @@ have some test to check both presence and absence of any feature
 
 ### TODO
 
-TODO list
+* improve Ubuntu support
 
 ### Contributing
 

manifests/params.pp

@@ -65,7 +65,7 @@
         {
           case $::operatingsystemrelease
           {
-            /^1[46].*$/:
+            /^1[468].*$/:
             {
               $pam_lockout='tally2'
             }

manifests/securetty.pp

@@ -1,7 +1,10 @@
 # puppet2sitepp @securettys
+# @param tty tty name (default: resource's name)
+# @param order securetty order (default: 42)
 define pam::securetty (
-                        $tty   = $name,
-                        $order = '42',
+                        $tty    = $name,
+                        $order  = '42',
+                        $ensure = 'present',
                       ) {
 
   if(!defined(Concat['/etc/securetty']))
@@ -14,12 +17,21 @@
     }
   }
 
-  if(!empty($tty))
+  case $ensure
   {
-    concat::fragment { "securetty ${tty}":
-      target  => '/etc/securetty',
-      order   => $order,
-      content => "${tty}\n",
+    'present':
+    {
+      if(!empty($tty))
+      {
+        concat::fragment { "securetty ${tty}":
+          target  => '/etc/securetty',
+          order   => $order,
+          content => "${tty}\n",
+        }
+      }
     }
+    default: {}
   }
+
+
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "eyp-pam",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "author": "eyp",
   "summary": "PAM modules, /etc/security/limits.conf and /etc/securetty management",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     },
     {
       "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [ "14.04", "16.04" ]
+      "operatingsystemrelease": [ "14.04", "16.04", "18.04" ]
     }
   ],
   "requirements": [