# HG changeset patch
# User John "Elwin" Edwards
# Date 1419630385 18000
# Node ID b1d3a618c254ac3f005e00a9bcd04819831182f3
# Parent  5cf88bd4e556b297c7b909a51e3a661876bf0202
Update some lighttpd configuration files.

diff -r 5cf88bd4e556 -r b1d3a618c254 lighttpd/conf.d/mime.conf
--- a/lighttpd/conf.d/mime.conf	Mon May 26 19:50:02 2014 -0700
+++ b/lighttpd/conf.d/mime.conf	Fri Dec 26 16:46:25 2014 -0500
@@ -68,6 +68,7 @@
   ".tbz"          =>      "application/x-bzip-compressed-tar",
   ".tar.bz2"      =>      "application/x-bzip-compressed-tar",
   ".rpm"          =>      "application/x-rpm",
+  ".json"         =>      "application/json",
   # make the default mime type application/octet-stream.
   ""              =>      "application/octet-stream",
  )
diff -r 5cf88bd4e556 -r b1d3a618c254 lighttpd/lighttpd.conf
--- a/lighttpd/lighttpd.conf	Mon May 26 19:50:02 2014 -0700
+++ b/lighttpd/lighttpd.conf	Fri Dec 26 16:46:25 2014 -0500
@@ -404,28 +404,39 @@
 ## hosting with SSL. If you want to run multiple SSL servers with
 ## one lighttpd instance you must use IP-based virtual hosting: ::
 ##
+## Mitigate CVE-2009-3555 by disabling client triggered renegotation
+## This is enabled by default.
+##
+## IMPORTANT: this setting can only be used in the global scope.
+## It does *not* work inside conditionals
+##
+#   ssl.disable-client-renegotiation = "enable"
+##
 ##   $SERVER["socket"] == "10.0.0.1:443" {
 ##     ssl.engine                  = "enable"
 ##     ssl.pemfile                 = "/etc/ssl/private/www.example.com.pem"
 ##     #
-##     # Mitigate BEAST attack:
+##     # (Following SSL/TLS Deployment Best Practices 1.3 / 17 September 2013 from:
+##     # https://www.ssllabs.com/projects/best-practices/index.html)
+##     # - BEAST is considered mitigaed on client side now, and new weaknesses have been found in RC4,
+##     #   so it is strongly advised to disable RC4 ciphers (HIGH doesn't include RC4)
+##     # - It is recommended to disable 3DES too (although disabling RC4 and 3DES breaks IE6+8 on Windows XP,
+##     #   so you might want to support 3DES for now - just remove the '!3DES' parts below).
+##     # - The examples below prefer ciphersuites with "Forward Secrecy" (and ECDHE over DHE (alias EDH)), remove '+kEDH +kRSA'
+##     #   if you don't want that.
+##     # - SRP and PSK are not supported anyway, excluding those ('!kSRP !kPSK') just keeps the list smaller (easier to review)
+##     # Check your cipher list with: openssl ciphers -v '...' (use single quotes as your shell won't like ! in double quotes)
 ##     #
-##     # A stricter base cipher suite. For details see:
-##     # http://blog.ivanristic.com/2011/10/mitigating-the-beast-attack-on-tls.html
-##     #
-##     ssl.cipher-list             = "ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM"
+##     # If you know you have RSA keys (standard), you can use:
+##     ssl.cipher-list             = "PROFILE=SYSTEM"
+##     # The more generic version (without the restriction to RSA keys) is
+##     # ssl.cipher-list           = "HIGH !aNULL !3DES +kEDH +kRSA !kSRP !kPSK"
 ##     #
 ##     # Make the server prefer the order of the server side cipher suite instead of the client suite.
-##     # This is necessary to mitigate the BEAST attack (unless you disable all non RC4 algorithms).
 ##     # This option is enabled by default, but only used if ssl.cipher-list is set.
 ##     #
 ##     # ssl.honor-cipher-order = "enable"
 ##     #
-##     # Mitigate CVE-2009-3555 by disabling client triggered renegotation
-##     # This is enabled by default.
-##     #
-##     # ssl.disable-client-renegotiation = "enable"
-##     #
 ##     server.name                 = "www.example.com"
 ##
 ##     server.document-root        = "/srv/www/vhosts/example.com/www/"