diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-24 02:08:32 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-24 02:08:32 +0000 |
| commit | ec4823b29d7792c9ca96d6e1a76bb43a111dfaac (patch) | |
| tree | 0a19843252766e2bf06638f0f84760c6ecd1e30c | |
| parent | 625b66668ae93c99a1736cdf63d4aa62cba4aec2 (diff) | |
| download | puppet-ec4823b29d7792c9ca96d6e1a76bb43a111dfaac.tar puppet-ec4823b29d7792c9ca96d6e1a76bb43a111dfaac.tar.gz puppet-ec4823b29d7792c9ca96d6e1a76bb43a111dfaac.tar.bz2 puppet-ec4823b29d7792c9ca96d6e1a76bb43a111dfaac.tar.xz puppet-ec4823b29d7792c9ca96d6e1a76bb43a111dfaac.zip | |
s/commiters/committers/, to be in sync with the ldap group name and the dictionnary
| -rw-r--r-- | manifests/nodes.pp | 2 | ||||
| -rw-r--r-- | modules/pam/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/pam/templates/system-auth | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 32a5cfad..1d3262ef 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -22,7 +22,7 @@ node valstar { include ssh::auth::keymaster include buildsystem::mainnode - include pam::commiters_access + include pam::committers_access include restrictshell::allow_svn subversion::snapshot { "/etc/puppet": diff --git a/modules/pam/manifests/init.pp b/modules/pam/manifests/init.pp index c3d5f7fc..63e8b12f 100644 --- a/modules/pam/manifests/init.pp +++ b/modules/pam/manifests/init.pp @@ -50,13 +50,13 @@ class pam { } # for server where people can connect with ssh ( git, svn ) - class commiters_access inherits base { + class committers_access inherits base { # 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 include restrictshell::shell - $access_class = "commiters" + $access_class = "committers" } } diff --git a/modules/pam/templates/system-auth b/modules/pam/templates/system-auth index 9ae45fb7..7dc3a47f 100644 --- a/modules/pam/templates/system-auth +++ b/modules/pam/templates/system-auth @@ -2,8 +2,8 @@ auth required pam_env.so <%- if access_class = 'admin' -%> auth required pam_succeed_if.so quiet user ingroup mga-sysadmin <%- end -%> -<%- if access_class = 'commiters' -%> -auth required pam_succeed_if.so quiet user ingroup mga-commiters +<%- if access_class = 'committers' -%> +auth required pam_succeed_if.so quiet user ingroup mga-committers <%- end -%> # this part is here if the module don't exist # basically, the idea is to copy the exact detail of sufficient, |