renaming 'secure' to 'ssl' #91

diff --git a/server/config.js b/server/config.js
index 037d1e048d48fd5e71f62115f10b04614194d26c..550e4d7e71702155e1cd421a107ad34a60895b08 100644 (file)
--- a/server/config.js
+++ b/server/config.js
@@ -8,22 +8,22 @@ conf.group = "";
 // Server listen blocks
 conf.servers = [];
 
+// Example plain-text server block
+conf.servers.push({
+    port:   7778,
+    address: "0.0.0.0"
+});
+
 // Example SSL server block
 conf.servers.push({
     port:     7777,
     address: "0.0.0.0",
 
-    secure:   true,
+    ssl:   true,
     ssl_key: "server.key",
     ssl_cert: "cert.pem"
 });
 
-// Example plain-text server block
-conf.servers.push({
-    secure:   false,
-    port:   7778,
-    address: "0.0.0.0"
-});
 
 // Where the client files are
 conf.public_http = "client/";

diff --git a/server/weblistener.js b/server/weblistener.js
index 0bc6fb243b043405f576cdf4e25baad57f49a00d..5a957211a605dba4ee81b93a758a31e9baec659f 100644 (file)
--- a/server/weblistener.js
+++ b/server/weblistener.js
@@ -23,7 +23,7 @@ var WebListener = function (config, transports) {
     
     http_handler = new HttpHandler(config);
     
-    if (config.secure) {
+    if (config.ssl) {
         opts = {
             key: fs.readFileSync(__dirname + '/' + config.ssl_key),
             cert: fs.readFileSync(__dirname + '/' + config.ssl_cert)
@@ -38,7 +38,7 @@ var WebListener = function (config, transports) {
         hs = https.createServer(opts, handleHttpRequest);
         
         // Start socket.io listening on this weblistener
-        this.ws = ws.listen(hs, {secure: true});
+        this.ws = ws.listen(hs, {ssl: true});
         hs.listen(config.port, config.address);
 
         console.log('Listening on ' + config.address + ':' + config.port.toString() + ' with SSL');
@@ -48,7 +48,7 @@ var WebListener = function (config, transports) {
         hs = http.createServer(handleHttpRequest);
 
         // Start socket.io listening on this weblistener
-        this.ws = ws.listen(hs, {secure: false});
+        this.ws = ws.listen(hs, {ssl: false});
         hs.listen(config.port, config.address);
 
         console.log('Listening on ' + config.address + ':' + config.port.toString() + ' without SSL');