#1827 Fallback to default settings when using input/output parameter

TheHive-Project · Mar 11, 2021 · cc933e0 · cc933e0
1 parent a04041f
commit cc933e0
Showing 1 changed file with 2 additions and 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
@@ -37,11 +37,11 @@ object Migrate extends App with MigrationOps {
         .text("global configuration file"),
       opt[File]('i', "input")
         .valueName("<file>")
-        .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("<file>")
-        .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))