diff options
| author | varac <varacanero@zeromail.org> | 2016-02-25 15:59:55 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-02-25 15:59:55 +0100 |
| commit | a33a7d634ab33f46814bd154882f3b1c9b3b3978 (patch) | |
| tree | a87668f7c6a29cdd34b3a2a8e77020d1341ac1c0 /puppet/modules | |
| parent | b8736b39e21251f9a888914822858c704fdb8e08 (diff) | |
remove couchdb_pwhash_alg leftover
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_apache/manifests/common.pp | 6 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp index dadf7ea5..8a11759a 100644 --- a/puppet/modules/site_apache/manifests/common.pp +++ b/puppet/modules/site_apache/manifests/common.pp @@ -4,7 +4,11 @@ class site_apache::common { include apache::module::rewrite include apache::module::env - class { '::apache': no_default_site => true, ssl => true } + class { '::apache': + no_default_site => true, + ssl => true, + ssl_cipher_suite => 'HIGH:MEDIUM:!aNULL:!MD5' + } # needed for the mod_ssl config include apache::module::mime diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 0c282e1c..b3d9fdf0 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -38,7 +38,6 @@ class site_couchdb { $couchdb_backup = $couchdb_config['backup'] $couchdb_mode = $couchdb_config['mode'] - $couchdb_pwhash_alg = $couchdb_config['pwhash_alg'] if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch } if $couchdb_mode =~ /^(plain|master)$/ { include site_couchdb::plain } |