From dbdc53307e6b5a2b64910a4e68149bc17b30be43 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Wed, 14 Mar 2012 18:50:13 +0100
Subject: [PATCH] Bugfix to not have server required anywhere as it causes
 problems for command line script usage of modules

---
 settings.json.template               | 5 ++++-
 settings.json.template_windows       | 6 +++++-
 src/node/server.js                   | 3 ---
 src/node/utils/Minify.js             | 7 +++----
 src/node/utils/caching_middleware.js | 1 -
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/settings.json.template b/settings.json.template
index 6c0ebd385..f4d12307e 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -51,5 +51,8 @@
   // "httpAuth" : "user:pass",
 
   /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
-  "loglevel": "INFO"
+  "loglevel": "INFO",
+
+  /* cache 6 hours = 1000*60*60*6 */
+  "maxAge": 21600000
 }
diff --git a/settings.json.template_windows b/settings.json.template_windows
index da661fcae..35b54d8da 100644
--- a/settings.json.template_windows
+++ b/settings.json.template_windows
@@ -40,5 +40,9 @@
   
   /* 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
+  "abiword" : null,
+
+  /* cache 6 hours = 1000*60*60*6 */
+  "maxAge": 21600000
+
 }
diff --git a/src/node/server.js b/src/node/server.js
index 19df6e728..bc4333cdc 100644
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -51,9 +51,6 @@ 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 = 1000*60*60*6;
-
 //set loglevel
 log4js.setGlobalLogLevel(settings.loglevel);
 
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index f569d4b92..b5d7b4727 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -29,7 +29,6 @@ var pro = require("uglify-js").uglify;
 var path = require('path');
 var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
 var RequireKernel = require('require-kernel');
-var server = require('../server');
 
 var ROOT_DIR = path.normalize(__dirname + "/../../static/");
 var TAR_PATH = path.join(__dirname, 'tar.json');
@@ -109,10 +108,10 @@ exports.minify = function(req, res, next)
       date = new Date(date);
       res.setHeader('last-modified', date.toUTCString());
       res.setHeader('date', (new Date()).toUTCString());
-      if (server.maxAge) {
-        var expiresDate = new Date((new Date()).getTime()+server.maxAge*1000);
+      if (settings.maxAge) {
+        var expiresDate = new Date((new Date()).getTime()+settings.maxAge*1000);
         res.setHeader('expires', expiresDate.toUTCString());
-        res.setHeader('cache-control', 'max-age=' + server.maxAge);
+        res.setHeader('cache-control', 'max-age=' + settings.maxAge);
       }
     }
 
diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js
index 114356f23..70d5a08c4 100644
--- a/src/node/utils/caching_middleware.js
+++ b/src/node/utils/caching_middleware.js
@@ -18,7 +18,6 @@ var async = require('async');
 var Buffer = require('buffer').Buffer;
 var fs = require('fs');
 var path = require('path');
-var server = require('../server');
 var zlib = require('zlib');
 var util = require('util');
 var settings = require('./Settings');