cloudcms-server 0.9.249 → 0.9.252

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.249",
+  "version": "0.9.252",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"

package/server/index.js

@@ -16,6 +16,9 @@ var session = require('express-session');
 var cookieParser = require('cookie-parser');
 var flash = require("connect-flash");
 
+const redis = require('redis');
+const connectRedis = require('connect-redis');
+
 // we don't bind a single passport - instead, we get the constructor here by hand
 var Passport = require("passport").Passport;
 
@@ -620,6 +623,18 @@ var startSlave = function(config, afterStartFn)
         delete process.configuration.https;
     }
     
+    
+    // auto configuration of session store
+    if (!process.configuration.session) {
+        process.configuration.session = {};
+    }
+    if (process.env.CLOUDCMS_SESSION_TYPE) {
+        process.configuration.session.enabled = true;
+        process.configuration.session.type = process.env.CLOUDCMS_SESSION_TYPE;
+    }
+    if (process.env.CLOUDCMS_SESSION_SECRET) {
+        process.configuration.session.secret = process.env.CLOUDCMS_SESSION_SECRET;
+    }
 
     // session store
     var initializedSession = null;
@@ -653,6 +668,28 @@ var startSlave = function(config, afterStartFn)
                 var SessionFileStore = require('session-file-store')(session);
                 sessionConfig.store = new SessionFileStore(options);
             }
+            else if (process.configuration.session.type === "redis")
+            {
+                var redisPort = process.env.CLOUDCMS_REDIS_PORT;
+                var redisHost = process.env.CLOUDCMS_REDIS_ENDPOINT;
+                
+                if (!redisPort)
+                {
+                    console.error("Cannot configure session for Redis storage because CLOUDCMS_REDIS_PORT is not defined");
+                }
+                else if (!redisHost)
+                {
+                    console.error("Cannot configure session for Redis storage because CLOUDCMS_REDIS_ENDPOINT is not defined");
+                }
+                else
+                {
+                    var redisOptions = {};
+                    var redisClient = redis.createClient(redisPort, redisHost, redisOptions);
+                    
+                    var RedisStore = connectRedis(session);
+                    sessionConfig.store = new RedisStore({ client: redisClient });
+                }
+            }
             else if (process.configuration.session.type === "memory" || !process.configuration.session.type)
             {
                 var options = {};

package/server/standalone.js

@@ -69,6 +69,7 @@ server.report(function(callback) {
     console.log("Hosts Directory: " + process.env.CLOUDCMS_HOSTS_PATH);
     console.log("LaunchPad Mode: " + process.env.CLOUDCMS_LAUNCHPAD_SETUP);
     console.log("Max Files Detected: " + process.env.CLOUDCMS_MAX_FILES);
+    console.log("Session Type: " + process.configuration.session.type);
     
     if (process.configuration.https) {
         console.log("Server is configured to use HTTPS");