summaryrefslogtreecommitdiff
path: root/src/node/server.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/node/server.js')
-rw-r--r--src/node/server.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/node/server.js b/src/node/server.js
index 8e6d6fa0..6b443edb 100644
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -51,10 +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, by default
-var hour = 60*60;
-exports.maxAge = settings.maxAge || 6 * hour;
-
//set loglevel
log4js.setGlobalLogLevel(settings.loglevel);
@@ -92,7 +88,12 @@ async.waterfall([
//let the server listen
app.listen(settings.port, settings.ip);
console.log("Server is listening at " + settings.ip + ":" + settings.port);
-
+ if(settings.adminHttpAuth){
+ console.log("Plugin admin page listening at " + settings.ip + ":" + settings.port + "/admin/plugins");
+ }
+ else{
+ console.log("Admin username and password not set in settings.json. To access admin please uncomment and edit adminHttpAuth in settings.json");
+ }
callback(null);
}
]);