mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-06-01 07:38:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config/: Cleanups in defaultSSL.ts and dockerSecret.ts

Browse source 
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-12 17:45:50 +02:00
parent ad0b0834e5
commit 37c2cd0731
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/config/defaultSSL.ts
View file

@ -1,10 +1,10 @@
import fs from 'fs' import fs from 'fs'
function getFile (path): string | undefined { function getFile (path): string {
if (fs.existsSync(path)) { if (fs.existsSync(path)) {
return path return path
} }
return undefined return ''
} }
export const defaultSSL = { export const defaultSSL = {

4
lib/config/dockerSecret.ts
View file

@ -9,7 +9,7 @@ function getSecret (secret): string | undefined {
return undefined return undefined
} }
export let dockerSecret: { s3: { accessKeyId: string | undefined; secretAccessKey: string | undefined }; github: { clientID: string | undefined; clientSecret: string | undefined }; facebook: { clientID: string | undefined; clientSecret: string | undefined }; google: { clientID: string | undefined; hostedDomain: string | undefined; clientSecret: string | undefined }; sessionSecret: string | undefined; sslKeyPath: string | undefined; twitter: { consumerSecret: string | undefined; consumerKey: string | undefined }; dropbox: { clientID: string | undefined; clientSecret: string | undefined; appKey: string | undefined }; gitlab: { clientID: string | undefined; clientSecret: string | undefined }; imgur: string | undefined; sslCertPath: string | undefined; sslCAPath: string | undefined; dhParamPath: string | undefined; dbURL: string | undefined; azure: { connectionString: string | undefined } } export let dockerSecret: { s3: { accessKeyId: string | undefined; secretAccessKey: string | undefined }; github: { clientID: string | undefined; clientSecret: string | undefined }; facebook: { clientID: string | undefined; clientSecret: string | undefined }; google: { clientID: string | undefined; hostedDomain: string | undefined; clientSecret: string | undefined }; sessionSecret: string | undefined; sslKeyPath: string | undefined; twitter: { consumerSecret: string | undefined; consumerKey: string | undefined }; dropbox: { clientID: string | undefined; clientSecret: string | undefined; appKey: string | undefined }; gitlab: { clientID: string | undefined; clientSecret: string | undefined }; imgur: string | undefined; sslCertPath: string | undefined; sslCAPath: (string | undefined)[]; dhParamPath: string | undefined; dbURL: string | undefined; azure: { connectionString: string | undefined } }
if (fs.existsSync(basePath)) { if (fs.existsSync(basePath)) {
dockerSecret = { dockerSecret = {
@ -17,7 +17,7 @@ if (fs.existsSync(basePath)) {
sessionSecret: getSecret('sessionsecret'), sessionSecret: getSecret('sessionsecret'),
sslKeyPath: getSecret('sslkeypath'), sslKeyPath: getSecret('sslkeypath'),
sslCertPath: getSecret('sslcertpath'), sslCertPath: getSecret('sslcertpath'),
sslCAPath: getSecret('sslcapath'), sslCAPath: [getSecret('sslcapath')],
dhParamPath: getSecret('dhparampath'), dhParamPath: getSecret('dhparampath'),
s3: { s3: {
accessKeyId: getSecret('s3_acccessKeyId'), accessKeyId: getSecret('s3_acccessKeyId'),