status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1446 from hackmdio/fix/docker-secret-not-complete 

Fix not all config in docker secret
This commit is contained in:
Raccoon 2020-03-06 21:01:04 +08:00 committed by GitHub
parent 9ec6dad461 3ae3cb191d
commit 42ae89cc72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/config/dockerSecret.js
View File

@ -13,18 +13,32 @@ function getSecret (secret) {
if (fs.existsSync(basePath)) { if (fs.existsSync(basePath)) {
module.exports = { module.exports = {
sessionsecret: getSecret('sessionsecret'), dbURL: getSecret('dburl'),
sslkeypath: getSecret('sslkeypath'), // ssl path
sslcertpath: getSecret('sslcertpath'), sslKeyPath: getSecret('sslkeypath'),
sslcapath: getSecret('sslcapath'), sslCertPath: getSecret('sslcertpath'),
dhparampath: getSecret('dhparampath'), sslCAPath: getSecret('sslcapath'),
dhParamPath: getSecret('dhparampath'),
// session
sessionSecret: getSecret('sessionsecret'),
imgur: {
clientID: getSecret('imgur_clientid')
},
s3: { s3: {
accessKeyId: getSecret('s3_acccessKeyId'), accessKeyId: getSecret('s3_acccessKeyId'),
secretAccessKey: getSecret('s3_secretAccessKey') secretAccessKey: getSecret('s3_secretAccessKey')
}, },
minio: {
accessKey: getSecret('minio_accessKey'),
secretKey: getSecret('minio_secretKey')
},
azure: { azure: {
connectionString: getSecret('azure_connectionString') connectionString: getSecret('azure_connectionString')
}, },
oauth2: {
clientID: getSecret('oauth2_clientID'),
clientSecret: getSecret('oauth2_clientSecret')
},
facebook: { facebook: {
clientID: getSecret('facebook_clientID'), clientID: getSecret('facebook_clientID'),
clientSecret: getSecret('facebook_clientSecret') clientSecret: getSecret('facebook_clientSecret')
@ -54,6 +68,12 @@ if (fs.existsSync(basePath)) {
clientID: getSecret('google_clientID'), clientID: getSecret('google_clientID'),
clientSecret: getSecret('google_clientSecret') clientSecret: getSecret('google_clientSecret')
}, },
imgur: getSecret('imgur_clientid') ldap: {
bindCredentials: getSecret('ldap_bindCredentials'),
tlsca: getSecret('ldap_tlsca')
},
saml: {
idpCert: getSecret('saml_idpCert')
}
} }
} }