updated branch.sh script to produce diffs from last svn tag

[packages/lighttpd.git] / lighttpd-ssl.conf

diff --git a/lighttpd-ssl.conf b/lighttpd-ssl.conf
index 8763c1ad41c4d5c19ecb0cd63d14ef2fc57bebcd..7e89b248e4040156a7a86ee15f6fe87033fe9be5 100644 (file)
--- a/lighttpd-ssl.conf
+++ b/lighttpd-ssl.conf
@@ -1,6 +1,6 @@
 # lighttpd support for SSLv2 and SSLv3
 #
-# Documentation: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:SSL
+# Documentation: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_SSL
 
 # (Following SSL/TLS Deployment Best Practices 1.3 / 17 September 2013 from:
 # https://www.ssllabs.com/projects/best-practices/index.html)
@@ -27,11 +27,23 @@
 $SERVER["socket"] == ":443" {
        ssl.engine = "enable"
 
+       # unsafe protocols
+       ssl.use-sslv2 = "disable"
+       ssl.use-sslv3 = "disable"
+
+       # https://wiki.mozilla.org/Security/Server_Side_TLS
+       # forward secrecy
+       ssl.honor-cipher-order = "enable"
+       ssl.cipher-list = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA"
+
+       # ssl.pemfile: path to the PEM file for SSL support (Should contain both
+       # the private key and the certificate)
        ## If you have a .crt and a .key file, cat them together into a
        ## single PEM file:
        ## $ cat lighttpd.key lighttpd.crt > lighttpd.pem
        ssl.pemfile = "/etc/lighttpd/server.pem"
 
+       # ssl.ca-file: path to the CA file for support of chained certificates
 #      ssl.ca-file = "/etc/certs/ca-certificates.crt"
 
        $HTTP["useragent"] =~ "MSIE" {