Deleted: puppet/deployment/access_class/manifests/init.pp
===================================================================
--- puppet/deployment/access_class/manifests/init.pp 2011-01-13 20:02:31 UTC (rev 787)
+++ puppet/deployment/access_class/manifests/init.pp 2011-01-13 20:07:12 UTC (rev 788)
@@ -1,33 +0,0 @@
-class access_class {
-
- # beware , theses classes are exclusives
- # if you need multiple group access, you need to define you own class
- # of access
-
- # for server where only admins can connect
- class admin {
- pam::multiple_ldap_access { "admin":
- access_classes => ['mga-sysadmin']
- }
- }
-
- # for server where people can connect with ssh ( git, svn )
- class committers {
- # this is required, as we force the shell to be the restricted one
- # openssh will detect if the file do not exist and while refuse to log the
- # user, and erase the password ( see pam_auth.c in openssh code, seek badpw )
- # so the file must exist
- # permission to use svn, git, etc must be added separatly
-
- pam::multiple_ldap_access { "committers":
- access_classes => ['mga-committers'],
- restricted_shell => true,
- }
- }
-
- class iso_makers {
- pam::multiple_ldap_access { "iso_makers":
- access_classes => ['mga-iso_makers','mga-sysadmin']
- }
- }
-}
Copied: puppet/deployment/access_classes/manifests/init.pp (from rev 787, puppet/deployment/access_class/manifests/init.pp)
===================================================================
--- puppet/deployment/access_classes/manifests/init.pp (rev 0)
+++ puppet/deployment/access_classes/manifests/init.pp 2011-01-13 20:07:12 UTC (rev 788)
@@ -0,0 +1,33 @@
+class access_classes {
+
+ # beware , theses classes are exclusives
+ # if you need multiple group access, you need to define you own class
+ # of access
+
+ # for server where only admins can connect
+ class admin {
+ pam::multiple_ldap_access { "admin":
+ access_classes => ['mga-sysadmin']
+ }
+ }
+
+ # for server where people can connect with ssh ( git, svn )
+ class committers {
+ # this is required, as we force the shell to be the restricted one
+ # openssh will detect if the file do not exist and while refuse to log the
+ # user, and erase the password ( see pam_auth.c in openssh code, seek badpw )
+ # so the file must exist
+ # permission to use svn, git, etc must be added separatly
+
+ pam::multiple_ldap_access { "committers":
+ access_classes => ['mga-committers'],
+ restricted_shell => true,
+ }
+ }
+
+ class iso_makers {
+ pam::multiple_ldap_access { "iso_makers":
+ access_classes => ['mga-iso_makers','mga-sysadmin']
+ }
+ }
+}
Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp 2011-01-13 20:02:31 UTC (rev 787)
+++ puppet/manifests/nodes.pp 2011-01-13 20:07:12 UTC (rev 788)
@@ -21,7 +21,7 @@
include buildsystem::mainnode
include buildsystem::mgacreatehome
- include access_class::committers
+ include access_classes::committers
include restrictshell::allow_svn
include restrictshell::allow_pkgsubmit
include openssh::ssh_keys_from_ldap
@@ -144,6 +144,6 @@
include default_mageia_server
timezone::timezone { "Europe/Paris": }
include bcd
- include access_class::iso_makers
+ include access_classes::iso_makers
include openssh::ssh_keys_from_ldap
}