diff options
| -rw-r--r-- | provider_base/services/mx.json | 1 | ||||
| -rw-r--r-- | puppet/modules/leap_mx/manifests/init.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/tls.pp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 50c03a19..25ccf4f0 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -8,6 +8,7 @@ "haproxy": { "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)" }, + "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]", "x509": { "use": true, "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp index 23fd1054..1e186bbb 100644 --- a/puppet/modules/leap_mx/manifests/init.pp +++ b/puppet/modules/leap_mx/manifests/init.pp @@ -1,9 +1,10 @@ class leap_mx { + $couchdb_admin_user = hiera('couchdb_admin_user') $couchdb_host = 'localhost' $couchdb_port = '4096' - $couchdb_user = $soledad::couchdb::user - $couchdb_password = $soledad::couchdb::password + $couchdb_user = $couchdb_admin_user['username'] + $couchdb_password = $couchdb_admin_user['password'] # # USER AND GROUP diff --git a/puppet/modules/site_postfix/manifests/mx/tls.pp b/puppet/modules/site_postfix/manifests/mx/tls.pp index 7da38100..4b7a2626 100644 --- a/puppet/modules/site_postfix/manifests/mx/tls.pp +++ b/puppet/modules/site_postfix/manifests/mx/tls.pp @@ -25,7 +25,7 @@ class site_postfix::mx::tls { 'smtpd_tls_key_file': value => $key_path; 'smtpd_tls_req_ccert': value => 'yes'; 'smtpd_tls_security_level': - value => 'encrypt'; + value => 'may'; } } |