mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-18 17:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #465 from Skgland/330-followup

Browse source 
#330 followup
This commit is contained in:
Yannick Bungers 2020-08-13 21:13:17 +02:00 • committed by GitHub
commit c42d2223e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/configuration-config-file.md
View file

@ -140,7 +140,7 @@ these are rarely used for various reasons.
| variables | example values | description | | variables | example values | description |
| --------- | ------ | ----------- | | --------- | ------ | ----------- |
| `ldap` | `{providerName: ..., url: ..., bindDn: ..., bindCredentials: ..., searchBase: ..., searchFilter: ..., searchAttributes: ..., usernameField: ..., useridField: ..., tlsca: ...}` | An object detailing the LDAP connection. Refer to the [LDAP-AD guide](guides/auth/ldap-AD.md) for more details! | | `ldap` | `{providerName: ..., url: ..., bindDn: ..., bindCredentials: ..., searchBase: ..., searchFilter: ..., searchAttributes: ..., usernameField: ..., useridField: ..., starttls: ..., tlsca: ...}` | An object detailing the LDAP connection. Refer to the [LDAP-AD guide](guides/auth/ldap-AD.md) for more details! |
### OAuth2 Login ### OAuth2 Login

1
src/lib/config/interfaces.ts
View file

@ -127,6 +127,7 @@ export interface Config {
usernameField: string; usernameField: string;
useridField: string; useridField: string;
tlsca: string; tlsca: string;
starttls?: boolean;
tlsOptions: { tlsOptions: {
ca: string[]; ca: string[];
}; };

4
src/lib/models/index.ts
View file

@ -35,7 +35,7 @@ const umzug = new Umzug({
}, },
// Required wrapper function required to prevent winstion issue // Required wrapper function required to prevent winstion issue
// https://github.com/winstonjs/winston/issues/1577 // https://github.com/winstonjs/winston/issues/1577
logging: message => { logging: (message): void => {
logger.info(message) logger.info(message)
}, },
storage: 'sequelize', storage: 'sequelize',
@ -44,7 +44,7 @@ const umzug = new Umzug({
} }
}) })
export async function runMigrations(): Promise<void> { export async function runMigrations (): Promise<void> {
// checks migrations and run them if they are not already applied // checks migrations and run them if they are not already applied
// exit in case of unsuccessful migrations // exit in case of unsuccessful migrations
await umzug.up().catch(error => { await umzug.up().catch(error => {