aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/access_classes
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-11 18:56:35 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-11 18:56:35 +0000
commit6764f193e4b954c549ee33f8498b63684ca49eb2 (patch)
tree9dde45a2cc3b351fbd974a3bc810c09ada7803cc /deployment/access_classes
parent065281dae19f263173906fbd4d2b5f9a77854e1e (diff)
downloadpuppet-6764f193e4b954c549ee33f8498b63684ca49eb2.tar
puppet-6764f193e4b954c549ee33f8498b63684ca49eb2.tar.gz
puppet-6764f193e4b954c549ee33f8498b63684ca49eb2.tar.bz2
puppet-6764f193e4b954c549ee33f8498b63684ca49eb2.tar.xz
puppet-6764f193e4b954c549ee33f8498b63684ca49eb2.zip
Make pam::multiple_ldap_access a class instead of a define
pam::multiple_ldap_access can only be included once. If it is included multiple time, the value of the variable $access_classes used in templates/system-auth is random. As it can only be included once, it should be a parameterized class and not a defined resource.
Diffstat (limited to 'deployment/access_classes')
-rw-r--r--deployment/access_classes/manifests/admin.pp2
-rw-r--r--deployment/access_classes/manifests/committers.pp2
-rw-r--r--deployment/access_classes/manifests/iso_makers.pp2
-rw-r--r--deployment/access_classes/manifests/web.pp2
-rw-r--r--deployment/access_classes/manifests/web_and_artwork.pp2
5 files changed, 5 insertions, 5 deletions
diff --git a/deployment/access_classes/manifests/admin.pp b/deployment/access_classes/manifests/admin.pp
index 4b9c8f87..73a78303 100644
--- a/deployment/access_classes/manifests/admin.pp
+++ b/deployment/access_classes/manifests/admin.pp
@@ -1,6 +1,6 @@
# for server where only admins can connect
class access_classes::admin {
- pam::multiple_ldap_access { 'admin':
+ class { pam::multiple_ldap_access:
access_classes => ['mga-sysadmin']
}
}
diff --git a/deployment/access_classes/manifests/committers.pp b/deployment/access_classes/manifests/committers.pp
index 81dbdb13..f57f7d50 100644
--- a/deployment/access_classes/manifests/committers.pp
+++ b/deployment/access_classes/manifests/committers.pp
@@ -7,7 +7,7 @@ class access_classes::committers {
# so the file must exist
# permission to use svn, git, etc must be added separatly
- pam::multiple_ldap_access { 'committers':
+ class { pam::multiple_ldap_access:
access_classes => ['mga-shell_access'],
restricted_shell => true,
}
diff --git a/deployment/access_classes/manifests/iso_makers.pp b/deployment/access_classes/manifests/iso_makers.pp
index 21201587..5e716bf1 100644
--- a/deployment/access_classes/manifests/iso_makers.pp
+++ b/deployment/access_classes/manifests/iso_makers.pp
@@ -1,5 +1,5 @@
class access_classes::iso_makers {
- pam::multiple_ldap_access { 'iso_makers':
+ class { pam::multiple_ldap_access:
access_classes => ['mga-iso_makers','mga-sysadmin']
}
}
diff --git a/deployment/access_classes/manifests/web.pp b/deployment/access_classes/manifests/web.pp
index 45a9992e..7437b52c 100644
--- a/deployment/access_classes/manifests/web.pp
+++ b/deployment/access_classes/manifests/web.pp
@@ -1,5 +1,5 @@
class access_classes::web {
- pam::multiple_ldap_access { 'web':
+ class { pam::multiple_ldap_access:
access_classes => ['mga-web','mga-sysadmin']
}
}
diff --git a/deployment/access_classes/manifests/web_and_artwork.pp b/deployment/access_classes/manifests/web_and_artwork.pp
index 9a85bd3d..b6ac6e5b 100644
--- a/deployment/access_classes/manifests/web_and_artwork.pp
+++ b/deployment/access_classes/manifests/web_and_artwork.pp
@@ -1,5 +1,5 @@
class access_classes::web_and_artwork {
- pam::multiple_ldap_access { 'web_artwork':
+ class { pam::multiple_ldap_access:
access_classes => ['mga-web','mga-sysadmin','mga-artwork']
}
}