aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/base_installation/manifests/ldap.pp41
-rw-r--r--modules/base_installation/templates/ldap/pam_ldap.conf.erb7
-rw-r--r--modules/profile/manifests/apache.pp2
3 files changed, 50 insertions, 0 deletions
diff --git a/modules/base_installation/manifests/ldap.pp b/modules/base_installation/manifests/ldap.pp
index 1825700..acc0014 100644
--- a/modules/base_installation/manifests/ldap.pp
+++ b/modules/base_installation/manifests/ldap.pp
@@ -21,4 +21,45 @@ class base_installation::ldap inherits base_installation {
21 require => File['/etc/openldap'], 21 require => File['/etc/openldap'],
22 } 22 }
23 23
24 $password_seed = lookup("base_installation::puppet_pass_seed")
25 $ldap_server = lookup("base_installation::ldap_server")
26 $ldap_base = lookup("base_installation::ldap_base")
27 $ldap_dn = lookup("base_installation::ldap_dn")
28 $ldap_password = generate_password(24, $password_seed, "ldap")
29 $ldap_attribute = "uid"
30
31 ensure_packages(["pam_ldap"])
32 file { "/etc/pam_ldap.conf":
33 ensure => "present",
34 mode => "0400",
35 owner => "root",
36 group => "root",
37 content => template("base_installation/ldap/pam_ldap.conf.erb"),
38 }
39
40 ["system-auth", "passwd"].each |$service| {
41 pam { "Allow to change ldap password via $service":
42 ensure => present,
43 service => $service,
44 type => "password",
45 control => "[success=done new_authtok_reqd=ok ignore=ignore default=bad]",
46 module => "pam_ldap.so",
47 arguments => "ignore_unknown_user",
48 position => 'before *[type="password" and module="pam_unix.so"]',
49 }
50 }
51
52 ["system-auth", "su", "su-l"].each |$service| {
53 ["auth", "account"].each |$type| {
54 pam { "Allow $service to $type with ldap password":
55 ensure => present,
56 service => $service,
57 type => $type,
58 control => "[success=done new_authtok_reqd=ok ignore=ignore default=bad]",
59 module => "pam_ldap.so",
60 arguments => "ignore_unknown_user",
61 position => "before *[type=\"$type\" and module=\"pam_unix.so\"]",
62 }
63 }
64 }
24} 65}
diff --git a/modules/base_installation/templates/ldap/pam_ldap.conf.erb b/modules/base_installation/templates/ldap/pam_ldap.conf.erb
new file mode 100644
index 0000000..f07490a
--- /dev/null
+++ b/modules/base_installation/templates/ldap/pam_ldap.conf.erb
@@ -0,0 +1,7 @@
1host <%= @ldap_server %>
2
3base <%= @ldap_base %>
4binddn <%= @ldap_dn %>
5bindpw <%= @ldap_password %>
6pam_login_attribute <%= @ldap_attribute %>
7
diff --git a/modules/profile/manifests/apache.pp b/modules/profile/manifests/apache.pp
index 382633b..7187350 100644
--- a/modules/profile/manifests/apache.pp
+++ b/modules/profile/manifests/apache.pp
@@ -4,6 +4,8 @@ class profile::apache {
4 root_directory_options => ["All"], 4 root_directory_options => ["All"],
5 default_mods => false, 5 default_mods => false,
6 default_vhost => false, 6 default_vhost => false,
7 user => "http",
8 group => "http",
7 log_formats => { 9 log_formats => {
8 combined => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %p', 10 combined => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %p',
9 common => '%h %l %u %t \"%r\" %>s %b', 11 common => '%h %l %u %t \"%r\" %>s %b',