From 96fd3c4ed85261ebf9b05d1fc180f2179974296b Mon Sep 17 00:00:00 2001
From: Feng Lee <ery.lee@gmail.com>
Date: Fri, 14 Oct 2016 16:10:07 +0800
Subject: [PATCH] https listener

---
 etc/emq.conf    | 20 ++++++++++----------
 priv/emq.schema | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/etc/emq.conf b/etc/emq.conf
index d6cb87838..2a23bd1ee 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -236,9 +236,9 @@ mqtt.listener.ssl.max_clients = 512
 ## Configuring SSL Options
 ## See http://erlang.org/doc/man/ssl.html
 mqtt.listener.ssl.handshake_timeout = 15 #seconds
-## mqtt.listener.ssl.keyfile = etc/ssl/key.pem
-## mqtt.listener.ssl.certfile = etc/ssl/cert.pem
-## mqtt.listener.ssl.cacertfile = etc/ssl/cacert.pem
+mqtt.listener.ssl.keyfile = etc/ssl/key.pem
+mqtt.listener.ssl.certfile = etc/ssl/cert.pem
+mqtt.listener.ssl.cacertfile = etc/ssl/cacert.pem
 ## mqtt.listener.ssl.verify = verify_peer
 ## mqtt.listener.ssl.failed_if_no_peer_cert = true
 
@@ -248,13 +248,13 @@ mqtt.listener.http.acceptors = 4
 mqtt.listener.http.max_clients = 64
 
 ## HTTP(SSL) Listener
-## mqtt.listener.https = 8083
-## mqtt.listener.https.acceptors = 4
-## mqtt.listener.https.max_clients = 64
-## mqtt.listener.https.handshake_timeout = 10 #seconds
-## mqtt.listener.https.certfile = etc/ssl/cert.pem
-## mqtt.listener.https.keyfile = etc/ssl/key.pem
-## mqtt.listener.https.cacertfile = etc/ssl/cacert.pem
+mqtt.listener.https = 8084
+mqtt.listener.https.acceptors = 4
+mqtt.listener.https.max_clients = 64
+mqtt.listener.https.handshake_timeout = 10 #seconds
+mqtt.listener.https.certfile = etc/ssl/cert.pem
+mqtt.listener.https.keyfile = etc/ssl/key.pem
+mqtt.listener.https.cacertfile = etc/ssl/cacert.pem
 ## mqtt.listener.https.verify = verify_peer
 ## mqtt.listener.https.failed_if_no_peer_cert = true
 
diff --git a/priv/emq.schema b/priv/emq.schema
index 2c2bc44a6..8ad4eb187 100644
--- a/priv/emq.schema
+++ b/priv/emq.schema
@@ -565,6 +565,31 @@ end}.
   {datatype, integer}
 ]}.
 
+{mapping, "mqtt.listener.https.handshake_timeout", "emqttd.listeners", [
+  {default, 15},
+  {datatype, integer}
+]}.
+
+{mapping, "mqtt.listener.https.keyfile", "emqttd.listeners", [
+  {datatype, string}
+]}.
+
+{mapping, "mqtt.listener.https.certfile", "emqttd.listeners", [
+  {datatype, string}
+]}.
+
+{mapping, "mqtt.listener.https.cacertfile", "emqttd.listeners", [
+  {datatype, string}
+]}.
+
+{mapping, "mqtt.listener.https.verify", "emqttd.listeners", [
+  {datatype, string}
+]}.
+
+{mapping, "mqtt.listener.https.failed_if_no_peer_cert", "emqttd.listeners", [
+  {datatype, {enum, [true, false]}}
+]}.
+
 {translation, "emqttd.listeners", fun(Conf) ->
     Filter  = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end,
     LisOpts = fun(Prefix) ->