summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp5
-rw-r--r--puppet/modules/site_postfix/manifests/mx/tls.pp2
2 files changed, 4 insertions, 3 deletions
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';
}
}