aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-17 23:37:02 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-17 23:37:02 -0200
commit3bd4a68fe03c36b5a6ce6c8f7a5b52013fb61205 (patch)
treed0be25cda857ce7fd0432d5ce72a820b503cfad1
parent9dd00f9a2c39cac0363d726c124a92129fede4c2 (diff)
downloadpuppet-nodo-3bd4a68fe03c36b5a6ce6c8f7a5b52013fb61205.tar.gz
puppet-nodo-3bd4a68fe03c36b5a6ce6c8f7a5b52013fb61205.tar.bz2
Multiple options for sourcing PAM configs
-rw-r--r--manifests/subsystems/pam.pp8
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index 4249b49..7e96321 100644
--- 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",
+ ],
}
}
}