aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-17 21:18:53 +0000
committerMichael Scherer <misc@mageia.org>2012-03-17 21:18:53 +0000
commitd397e44c781725d8b7a98c58a097d2a91cc7edb1 (patch)
treef55e865800d0f78239ee959517b4d44f80f43ce6
parent888f39d8fe2e56a17c98440fdd33a68667b62f64 (diff)
downloadpuppet-d397e44c781725d8b7a98c58a097d2a91cc7edb1.tar
puppet-d397e44c781725d8b7a98c58a097d2a91cc7edb1.tar.gz
puppet-d397e44c781725d8b7a98c58a097d2a91cc7edb1.tar.bz2
puppet-d397e44c781725d8b7a98c58a097d2a91cc7edb1.tar.xz
puppet-d397e44c781725d8b7a98c58a097d2a91cc7edb1.zip
split pam module into 3 files
-rw-r--r--modules/pam/manifests/base.pp24
-rw-r--r--modules/pam/manifests/init.pp31
-rw-r--r--modules/pam/manifests/multiple_ldap_access.pp6
3 files changed, 31 insertions, 30 deletions
diff --git a/modules/pam/manifests/base.pp b/modules/pam/manifests/base.pp
new file mode 100644
index 00000000..df913101
--- /dev/null
+++ b/modules/pam/manifests/base.pp
@@ -0,0 +1,24 @@
+class pam::base {
+ package { ['pam_ldap','nss_ldap','nscd']: }
+
+ service { 'nscd':
+ require => Package['nscd'],
+ }
+
+ file {
+ '/etc/pam.d/system-auth':
+ content => template('pam/system-auth');
+ '/etc/nsswitch.conf':
+ content => template('pam/nsswitch.conf');
+ '/etc/ldap.conf':
+ content => template('pam/ldap.conf');
+ '/etc/openldap/ldap.conf':
+ content => template('pam/openldap.ldap.conf');
+ }
+
+ $ldap_password = extlookup("${::fqdn}_ldap_password",'x')
+ file { '/etc/ldap.secret':
+ mode => '0600',
+ content => $ldap_password
+ }
+}
diff --git a/modules/pam/manifests/init.pp b/modules/pam/manifests/init.pp
index 8d25d056..180ad852 100644
--- a/modules/pam/manifests/init.pp
+++ b/modules/pam/manifests/init.pp
@@ -1,30 +1 @@
-class pam {
- class base {
- package { ["pam_ldap","nss_ldap","nscd"]: }
-
- service { nscd:
- require => Package['nscd'],
- }
-
- file {
- "/etc/pam.d/system-auth": content => template("pam/system-auth");
- "/etc/nsswitch.conf": content => template("pam/nsswitch.conf");
- "/etc/ldap.conf": content => template("pam/ldap.conf");
- "/etc/openldap/ldap.conf": content => template("pam/openldap.ldap.conf");
- }
-
- $ldap_password = extlookup("${fqdn}_ldap_password",'x')
- file { "ldap.secret":
- path => "/etc/ldap.secret",
- mode => 600,
- content => $ldap_password
- }
- }
-
- define multiple_ldap_access($access_classes,$restricted_shell = false) {
- if $restricted_shell {
- include restrictshell
- }
- include base
- }
-}
+class pam { }
diff --git a/modules/pam/manifests/multiple_ldap_access.pp b/modules/pam/manifests/multiple_ldap_access.pp
new file mode 100644
index 00000000..ecda7018
--- /dev/null
+++ b/modules/pam/manifests/multiple_ldap_access.pp
@@ -0,0 +1,6 @@
+define pam::multiple_ldap_access($access_classes, $restricted_shell = false) {
+ if $restricted_shell {
+ include restrictshell
+ }
+ include pam::base
+}