mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-22 08:26:16 -04:00
Readded support for apikey (#6382)
This commit is contained in:
parent
2c1916ac09
commit
556c3c8e5b
7 changed files with 74 additions and 14 deletions
|
@ -45,5 +45,10 @@ for (let i = 0; i < argv.length; i++) {
|
|||
exports.argv.sessionkey = arg;
|
||||
}
|
||||
|
||||
// Override location of APIKEY.txt file
|
||||
if (prevArg === '--apikey') {
|
||||
exports.argv.apikey = arg;
|
||||
}
|
||||
|
||||
prevArg = arg;
|
||||
}
|
||||
|
|
|
@ -156,6 +156,15 @@ exports.socketIo = {
|
|||
maxHttpBufferSize: 10000,
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
The authentication method used by the server.
|
||||
The default value is sso
|
||||
If you want to use the old authentication system, change this to apikey
|
||||
*/
|
||||
exports.authenticationMethod = 'sso'
|
||||
|
||||
|
||||
/*
|
||||
* The Type of the database
|
||||
*/
|
||||
|
@ -519,6 +528,8 @@ exports.getGitCommit = () => {
|
|||
// Return etherpad version from package.json
|
||||
exports.getEpVersion = () => require('../../package.json').version;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Receives a settingsObj and, if the property name is a valid configuration
|
||||
* item, stores it in the module's exported properties via a side effect.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue