mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 08:56:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' into ace2_refactoring

Browse source
This commit is contained in:
Matthias Bartelmeß 2012-04-05 22:28:16 +02:00
commit d61cdf57cc
3 changed files with 59 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/node/server.js
View file

@ -88,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);
}
]);