diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-28 12:49:14 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-28 12:49:14 +0200 |
commit | 85c0bf0d262633f4a153b5662472cc0ed20d41ae (patch) | |
tree | aec7801783506efd2a0e04eaccee6730fa9788de | |
parent | 417ffb62ee8c654bb6d2910edf3fda0552c444fa (diff) | |
parent | 95416ae2301b936829cab964792a8a1e07b06720 (diff) | |
download | Puppet-85c0bf0d262633f4a153b5662472cc0ed20d41ae.tar.gz Puppet-85c0bf0d262633f4a153b5662472cc0ed20d41ae.tar.zst Puppet-85c0bf0d262633f4a153b5662472cc0ed20d41ae.zip |
Merge branch 'dev'
-rw-r--r-- | modules/role/files/cryptoportfolio/pam_postgresql | 3 | ||||
-rw-r--r-- | modules/role/templates/cryptoportfolio/pam_ldap_postgresql.conf.erb | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/modules/role/files/cryptoportfolio/pam_postgresql b/modules/role/files/cryptoportfolio/pam_postgresql deleted file mode 100644 index 70a90ae..0000000 --- a/modules/role/files/cryptoportfolio/pam_postgresql +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | auth required pam_ldap.so config=/etc/pam_ldap.d/postgresql.conf | ||
2 | account required pam_ldap.so config=/etc/pam_ldap.d/postgresql.conf | ||
3 | |||
diff --git a/modules/role/templates/cryptoportfolio/pam_ldap_postgresql.conf.erb b/modules/role/templates/cryptoportfolio/pam_ldap_postgresql.conf.erb deleted file mode 100644 index f3d9674..0000000 --- a/modules/role/templates/cryptoportfolio/pam_ldap_postgresql.conf.erb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | host <%= @ldap_server %> | ||
2 | |||
3 | base <%= @ldap_base %> | ||
4 | binddn <%= @ldap_dn %> | ||
5 | bindpw <%= @ldap_password %> | ||
6 | pam_login_attribute <%= @ldap_attribute %> | ||