Allow maxAge of server to be specified in a setting.

node/server.js

@@ -61,8 +61,7 @@ console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
 
 var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
 
-//cache 6 hours
+exports.maxAge = settings.maxAge;
-exports.maxAge = 1000*60*60*6;
 
 //set loglevel
 log4js.setGlobalLogLevel(settings.loglevel);

node/utils/Settings.js

@@ -55,6 +55,11 @@ exports.requireSession = false;
  */
 exports.editOnly = false;
 
+/**
+ * Max age that responses will have (affects caching layer).
+ */
+exports.maxAge = 1000*60*60*6; // 6 hours
+
 /**
  * A flag that shows if minification is enabled or not
  */

settings.json.template

@@ -39,6 +39,10 @@
      but makes it impossible to debug the javascript/css */
   "minify" : true,
 
+  /* How long may clients use served javascript code? Without versioning this
+    is may cause problems during deployment. */
+  "maxAge" : 1000*60*60*6, // 6 hours
+  
   /* This is the path to the Abiword executable. Setting it to null, disables abiword.
      Abiword is needed to enable the import/export of pads*/  
   "abiword" : null,