github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-29 14:24:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #769 from SISheogorath/fix/minioInteger

Browse source 
Add helper function to fix number problems
This commit is contained in:
Christoph (Sheogorath) Kern 2018-03-17 21:32:03 +01:00 committed by GitHub
commit e2b8b92530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/config/environment.js
View file

@ -1,11 +1,11 @@
'use strict' 'use strict'
const {toBooleanConfig, toArrayConfig} = require('./utils') const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
module.exports = { module.exports = {
domain: process.env.HMD_DOMAIN, domain: process.env.HMD_DOMAIN,
urlpath: process.env.HMD_URL_PATH, urlpath: process.env.HMD_URL_PATH,
port: process.env.HMD_PORT, port: toIntegerConfig(process.env.HMD_PORT),
urladdport: toBooleanConfig(process.env.HMD_URL_ADDPORT), urladdport: toBooleanConfig(process.env.HMD_URL_ADDPORT),
usessl: toBooleanConfig(process.env.HMD_USESSL), usessl: toBooleanConfig(process.env.HMD_USESSL),
hsts: { hsts: {
@ -40,7 +40,7 @@ module.exports = {
secretKey: process.env.HMD_MINIO_SECRET_KEY, secretKey: process.env.HMD_MINIO_SECRET_KEY,
endPoint: process.env.HMD_MINIO_ENDPOINT, endPoint: process.env.HMD_MINIO_ENDPOINT,
secure: toBooleanConfig(process.env.HMD_MINIO_SECURE), secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
port: parseInt(process.env.HMD_MINIO_PORT) port: toIntegerConfig(process.env.HMD_MINIO_PORT)
}, },
s3bucket: process.env.HMD_S3_BUCKET, s3bucket: process.env.HMD_S3_BUCKET,
facebook: { facebook: {

7
lib/config/utils.js
View file

@ -13,3 +13,10 @@ exports.toArrayConfig = function toArrayConfig (configValue, separator = ',', fa
} }
return fallback return fallback
} }
exports.toIntegerConfig = function toIntegerConfig (configValue) {
if (configValue && typeof configValue === 'string') {
return parseInt(configValue)
}
return configValue
}