diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-27 13:26:28 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-27 13:26:28 +0200 |
commit | bb0de052ea671bb74c077df89fd4268e42f8714d (patch) | |
tree | 94cf976961bbb96491c31e1c8b30b8ac762ebd9c | |
parent | 320d02a091e0548126c27ca7efd86341b80be4ea (diff) | |
parent | 6840de8261fda8832964098a5f685eb79640f5d1 (diff) | |
download | Puppet-bb0de052ea671bb74c077df89fd4268e42f8714d.tar.gz Puppet-bb0de052ea671bb74c077df89fd4268e42f8714d.tar.zst Puppet-bb0de052ea671bb74c077df89fd4268e42f8714d.zip |
Merge branch 'etherpad' into dev
-rw-r--r-- | modules/profile/manifests/postgresql_master.pp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/profile/manifests/postgresql_master.pp b/modules/profile/manifests/postgresql_master.pp index 6f8854d..067345a 100644 --- a/modules/profile/manifests/postgresql_master.pp +++ b/modules/profile/manifests/postgresql_master.pp | |||
@@ -88,9 +88,15 @@ define profile::postgresql_master ( | |||
88 | $ldap_server = lookup("base_installation::ldap_server") | 88 | $ldap_server = lookup("base_installation::ldap_server") |
89 | $ldap_base = lookup("base_installation::ldap_base") | 89 | $ldap_base = lookup("base_installation::ldap_base") |
90 | $ldap_dn = lookup("base_installation::ldap_dn") | 90 | $ldap_dn = lookup("base_installation::ldap_dn") |
91 | $ldap_cn = lookup("base_installation::ldap_cn") | ||
91 | $ldap_password = generate_password(24, $password_seed, "ldap") | 92 | $ldap_password = generate_password(24, $password_seed, "ldap") |
92 | $ldap_attribute = "cn" | 93 | $ldap_attribute = "cn" |
93 | 94 | ||
95 | # This is to be replicated to the backup | ||
96 | postgresql::server::role { $ldap_cn: | ||
97 | replication => true, | ||
98 | } | ||
99 | |||
94 | file { "/etc/pam_ldap.d": | 100 | file { "/etc/pam_ldap.d": |
95 | ensure => directory, | 101 | ensure => directory, |
96 | mode => "0755", | 102 | mode => "0755", |