Merge branch 'master' into recurrent_events

2019-07-17 11:05:13 +02:00
parent ca1c2f3079 1ed0ff3917
commit 599bc11057
13 changed files with 240 additions and 14 deletions
--- a/server/cli.js
+++ b/server/cli.js
@@ -188,7 +188,7 @@ require('yargs')
 .option('config', { 
  alias: 'c',
  describe: 'Configuration file',
-  default: './gancio_config.json',
+  default: '/gancio/config.json',
 })
 .coerce('config', config_path => {
  const absolute_config_path = path.resolve(cwd, config_path)