diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-12 13:23:29 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-12 14:37:28 -0400 |
commit | 115691c87bad3f5863f088e73603133b67c9f828 (patch) | |
tree | bbfd7b5c0d0c220ef3e52eb25acd4595a46b85d0 /files/include.d/OpenBSD/ssl_defaults.inc | |
parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
parent | 5ec141dfbf218dd9b2f2611d788db98f74e65073 (diff) |
Merge remote-tracking branch 'immerda/master'
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
Diffstat (limited to 'files/include.d/OpenBSD/ssl_defaults.inc')
-rw-r--r-- | files/include.d/OpenBSD/ssl_defaults.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/files/include.d/OpenBSD/ssl_defaults.inc b/files/include.d/OpenBSD/ssl_defaults.inc index e7d2c36..67cf36f 100644 --- a/files/include.d/OpenBSD/ssl_defaults.inc +++ b/files/include.d/OpenBSD/ssl_defaults.inc @@ -1,4 +1,5 @@ SSLEngine on -SSLCipherSuite HIGH:MEDIUM:!ADH:-SSLv2 +#SSLCipherSuite HIGH:MEDIUM:!ADH:-SSLv2 +SSLCipherSuite HIGH:MEDIUM:!aNULL:!SSLv2:!MD5:@STRENGTH SSLCertificateFile /etc/ssl/server.crt SSLCertificateKeyFile /etc/ssl/private/server.key |