Skip to content

Configuration externalization #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juliendangers wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Configuration externalization #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79770c4
refacto(config): allow custom redis config
juliendangers Jun 7, 2016
9083f2a
refacto(config): load config from env variables only
juliendangers Jun 7, 2016
69ad301
refacto(config): load file only if it exists
juliendangers Jun 8, 2016
ffd1ed3
fix(config): only validate after load
juliendangers Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions config/autoconfig.js
View file
Open in desktop

This file was deleted.

37 changes: 23 additions & 14 deletions config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
* See https://github.com/mozilla/node-convict/blob/master/README.md for details.
*/
var convict = require('convict');
var fs = require('fs');

module.exports = function () {

// Check if we need to auto configure for a fast start.
var env = process.env.NODE_ENV || 'dev';
var configFile = process.env.FREIGHT_CONFIG || __dirname + '/' + env + '.json';

require('./autoconfig')(configFile);

var conf = convict({
env: {
doc: 'The applicaton environment.',
Expand Down Expand Up @@ -40,43 +38,51 @@ module.exports = function () {
limit: {
doc: 'The bundle transmission size limit, in kb.',
format: 'nat',
default: 500
default: 500,
env: 'LIMIT'
},
password: {
doc: 'The password that is used to create Freight bundles.',
format: String,
default: ''
default: '',
env: 'FREIGHT_PASSWORD'
},
storage: {
// TODO: You need to create this directory if it does not exist.
// This directory is also used as a static file directory for Freight bundles.
doc: 'Default bundle storage directory. Make sure it is somewhere in the Freight Server directory.',
format: String,
default: __dirname + '/../storage'
default: __dirname + '/../storage',
env: 'STORAGE_DIRECTORY'
},
tempDir: {
// TODO: You need to create this directory if it does not exist.
doc: 'Default directory for temporary files.',
format: String,
default: __dirname + '/../temp'
default: __dirname + '/../temp',
env: 'TEMP_DIRECTORY'
},
// Redis config, see https://github.com/learnboost/kue#redis-connection-settings
redis: {
port: {
doc: 'Redis Port',
format: 'port',
default: 6379
default: 6379,
env: 'REDIS_PORT'
},
host: {
doc: 'Redis IP address to bind.',
format: 'ipaddress',
default: '127.0.0.1'
format: String,
default: '127.0.0.1',
env: 'REDIS_HOST'
},
auth: {
doc: 'Redis Password.',
format: String,
default: ''
default: '',
env: 'REDIS_PASSWORD'
},
// TODO : see how we can extract redis options from env variables
options: {
doc: 'Redis Options.',
format: Object,
Expand All @@ -87,14 +93,17 @@ module.exports = function () {
delay: {
doc: 'Repository update check delay in milliseconds',
format: 'nat',
default: 60 * 60000
default: 60 * 60000,
env: 'TRACK_DELAY'
}
}
});

// load environment dependent configuration
// TODO: development only for now, change it later.
conf.loadFile(configFile);
if (fs.existsSync(configFile)) {
// TODO: development only for now, change it later.
conf.loadFile(configFile);
}
// perform configuration validation
conf.validate();

Expand Down