Multiple options for sourcing PAM configs

diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index 4249b49804e3f8a11687d536a367cbf5e1269411..7e96321e1fc01d898a32ff2fcf046a433d3095ef 100644 (file)
--- a/manifests/subsystems/pam.pp
+++ b/manifests/subsystems/pam.pp
@@ -2,7 +2,9 @@ class pam {
   if $pam != false {
     # pam - login
     file { "/etc/pam.d/login":
-      source  => "puppet://$server/modules/nodo/etc/pam.d/login.${lsbdistcodename}",
+      source  => [ "puppet://$server/modules/nodo/etc/pam.d/login.${lsbdistcodename}",
+                   "puppet://$server/modules/nodo/etc/pam.d/login",
+                 ],
       owner   => "root",
       group   => "root",
       mode    => 0644,
@@ -24,7 +26,9 @@ class pam {
       owner   => root,
       group   => root,
       mode    => 0644,
-      source  => "puppet://$server/files/etc/security/pam_mount.conf.xml",
+      source  => [ "puppet://$server/files/etc/security/pam_mount.conf.xml.$lsbdistcodename",
+                   "puppet://$server/files/etc/security/pam_mount.conf.xml",
+                 ],
     }
   }
 }