Merge 674cec7502 into 5d2965ffc5

.gitignore

@@ -1,3 +1,4 @@
+.env
 npm-debug.log
 node_modules
 *.swp

config.js

@@ -32,6 +32,8 @@
     }
   },
 
+  "useDotenv": true,
+
   "storage": {
     "type": "file"
   },

package.json

@@ -19,6 +19,7 @@
     "connect-ratelimit": "0.0.7",
     "connect-route": "0.1.5",
     "pg": "^8.0.0",
+    "dotenv": "^8.2.0",
     "redis": "0.8.1",
     "redis-url": "0.1.0",
     "st": "^2.0.0",

server.js

@@ -16,6 +16,10 @@ const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
 config.port = process.env.PORT || config.port || 7777;
 config.host = process.env.HOST || config.host || 'localhost';
 
+if (config.useDotenv) {
+    require('dotenv').config();
+}
+
 // Set up the logger
 if (config.logging) {
   try {
@@ -44,6 +48,10 @@ if (!config.storage.type) {
 
 var Store, preferredStore;
 
+if (config.useDotenv) {
+  config.storage.password = process.env.STORAGE_PASSWORD;
+}
+
 if (process.env.REDISTOGO_URL && config.storage.type === 'redis') {
   var redisClient = require('redis-url').connect(process.env.REDISTOGO_URL);
   Store = require('./lib/document_stores/redis');