summaryrefslogtreecommitdiff
path: root/lib/config.js
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lib/config.js19
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/config.js b/lib/config.js
index 053d083b..2f6792b7 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -19,11 +19,13 @@ var urladdport = process.env.HMD_URL_ADDPORT ? (process.env.HMD_URL_ADDPORT ===
var usecdn = process.env.HMD_USECDN ? (process.env.HMD_USECDN === 'true') : ((typeof config.usecdn === 'boolean') ? config.usecdn : true);
+var allowanonymous = process.env.HMD_ALLOW_ANONYMOUS ? (process.env.HMD_ALLOW_ANONYMOUS === 'true') : ((typeof config.allowanonymous === 'boolean') ? config.allowanonymous : true);
+
+var allowfreeurl = process.env.HMD_ALLOW_FREEURL ? (process.env.HMD_ALLOW_FREEURL === 'true') : !!config.allowfreeurl;
+
// db
-var db = config.db || {
- dialect: 'sqlite',
- storage: './db.hackmd.sqlite'
-};
+var dburl = config.dburl || process.env.HMD_DB_URL || process.env.DATABASE_URL;
+var db = config.db || {};
// ssl path
var sslkeypath = config.sslkeypath || '';
@@ -125,7 +127,7 @@ if (process.env.HMD_LDAP_TLS_CA) {
ldap.tlsOptions = ldap.tlsOptions ? Object.assign(ldap.tlsOptions, ca) : ca
}
var imgur = process.env.HMD_IMGUR_CLIENTID || config.imgur || false;
-var email = process.env.HMD_EMAIL || config.email || false;
+var email = process.env.HMD_EMAIL ? (process.env.HMD_EMAIL === 'true') : !!config.email;
function getserverurl() {
var url = '';
@@ -140,8 +142,8 @@ function getserverurl() {
return url;
}
-var version = '0.4.5';
-var minimumCompatibleVersion = '0.4.5';
+var version = '0.5.0';
+var minimumCompatibleVersion = '0.5.0';
var maintenance = true;
var cwd = path.join(__dirname, '..');
@@ -156,6 +158,9 @@ module.exports = {
usessl: usessl,
serverurl: getserverurl(),
usecdn: usecdn,
+ allowanonymous: allowanonymous,
+ allowfreeurl: allowfreeurl,
+ dburl: dburl,
db: db,
sslkeypath: path.join(cwd, sslkeypath),
sslcertpath: path.join(cwd, sslcertpath),