Merge from develop v2.0.14 release (#196)

* Selection of the ssl protocols/ciphers is done using the default server block. (#189) * Fix wrap for tags (#195)
2019-09-04 14:51:24 +10:00
parent 31aa9c9644
commit 0bc12f3bdf
5 changed files with 13 additions and 3 deletions
--- a/rootfs/etc/nginx/conf.d/default.conf
+++ b/rootfs/etc/nginx/conf.d/default.conf
@ -47,7 +47,7 @@ server {

  ssl_certificate /data/nginx/dummycert.pem;
  ssl_certificate_key /data/nginx/dummykey.pem;
-  ssl_ciphers aNULL;
+  include conf.d/include/ssl-ciphers.conf;

  return 444;
 }