From d37321e28de0445322055ef20306d838b02a6f87 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Sun, 23 Oct 2016 22:27:02 +0800 Subject: [PATCH] Change use cdn config option default to be true --- README.md | 3 ++- lib/config.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9af4fbdb7..08f6fc9e5 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ Environment variables (will overwrite other server configs) | HMD_ALLOW_ORIGIN | `localhost, hackmd.io` | domain name whitelist (use comma to separate) | | HMD_PROTOCOL_USESSL | `true` or `false` | set to use ssl protocol for resources path (only applied when domain is set) | | HMD_URL_ADDPORT | `true` or `false` | set to add port on callback url (port 80 or 443 won't applied) (only applied when domain is set) | +| HMD_USECDN | `true` or `false` | set to use CDN resources or not (default is `true`) | | HMD_FACEBOOK_CLIENTID | no example | Facebook API client id | | HMD_FACEBOOK_CLIENTSECRET | no example | Facebook API client secret | | HMD_TWITTER_CONSUMERKEY | no example | Twitter API consumer key | @@ -144,7 +145,7 @@ Server settings `config.json` | usessl | `true` or `false` | set to use ssl server (if true will auto turn on `protocolusessl`) | | protocolusessl | `true` or `false` | set to use ssl protocol for resources path (only applied when domain is set) | | urladdport | `true` or `false` | set to add port on callback url (port 80 or 443 won't applied) (only applied when domain is set) | -| usecdn | `true` or `false` | set to use CDN resources or not | +| usecdn | `true` or `false` | set to use CDN resources or not (default is `true`) | | db | `{ "dialect": "sqlite", "storage": "./db.hackmd.sqlite" }` | set the db configs, [see more here](http://sequelize.readthedocs.org/en/latest/api/sequelize/) | | sslkeypath | `./cert/client.key` | ssl key path (only need when you set usessl) | | sslcertpath | `./cert/hackmd_io.crt` | ssl cert path (only need when you set usessl) | diff --git a/lib/config.js b/lib/config.js index b781c82b3..0aa154bc9 100644 --- a/lib/config.js +++ b/lib/config.js @@ -17,7 +17,7 @@ var protocolusessl = (usessl === true && typeof process.env.HMD_PROTOCOL_USESSL ? true : (process.env.HMD_PROTOCOL_USESSL ? (process.env.HMD_PROTOCOL_USESSL === 'true') : !!config.protocolusessl); var urladdport = process.env.HMD_URL_ADDPORT ? (process.env.HMD_URL_ADDPORT === 'true') : !!config.urladdport; -var usecdn = process.env.HMD_USECDN ? (process.env.HMD_USECDN === 'true') : !!config.usecdn; +var usecdn = process.env.HMD_USECDN ? (process.env.HMD_USECDN === 'true') : !!!config.usecdn; // db var db = config.db || {