From cc933e05da407960398729de39a6818f6d311bd0 Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 11 Mar 2021 16:27:48 +0100 Subject: [PATCH] #1827 Fallback to default settings when using input/output parameter --- .../src/main/scala/org/thp/thehive/migration/Migrate.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala b/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala index d7ad5c3988..7d26c49be1 100644 --- a/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala +++ b/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala @@ -37,11 +37,11 @@ object Migrate extends App with MigrationOps { .text("global configuration file"), opt[File]('i', "input") .valueName("") - .action((f, c) => addConfig(c, "input", ConfigFactory.parseFileAnySyntax(f).resolve().root())) + .action((f, c) => addConfig(c, "input", ConfigFactory.parseFileAnySyntax(f).resolve().root().withFallback(c.getConfig("input")))) .text("TheHive3 configuration file"), opt[File]('o', "output") .valueName("") - .action((f, c) => addConfig(c, "output", ConfigFactory.parseFileAnySyntax(f).resolve().root())) + .action((f, c) => addConfig(c, "output", ConfigFactory.parseFileAnySyntax(f).resolve().root().withFallback(c.getConfig("output")))) .text("TheHive4 configuration file"), opt[Unit]('d', "drop-database") .action((_, c) => addConfig(c, "output.dropDatabase", true))