From 9926a79503c9bd6454c076f2b60cd577f6061e4d Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 19 Feb 2022 07:29:58 +0000
Subject: [PATCH] Using Borg version 1.1.17 as default. Version is now configurable via web client and json file.
---
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ConfigurationRest.kt | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ConfigurationRest.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ConfigurationRest.kt
index 29dba18..1fff9bf 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ConfigurationRest.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ConfigurationRest.kt
@@ -2,13 +2,11 @@
import de.micromata.borgbutler.cache.ButlerCache
import de.micromata.borgbutler.config.ConfigurationHandler
-import de.micromata.borgbutler.json.JsonUtils
import de.micromata.borgbutler.server.BorgInstallation
import de.micromata.borgbutler.server.ServerConfiguration
import de.micromata.borgbutler.server.user.UserData
import de.micromata.borgbutler.server.user.UserManager
import mu.KotlinLogging
-import org.apache.commons.lang3.StringUtils
import org.springframework.web.bind.annotation.*
private val log = KotlinLogging.logger {}
@@ -21,19 +19,19 @@
fun getConfig(): ConfigurationInfo {
val configurationInfo = ConfigurationInfo()
configurationInfo.serverConfiguration = ServerConfiguration.get()
- configurationInfo.borgVersion = BorgInstallation.getInstance().borgVersion
+ configurationInfo.borgConfig = BorgInstallation.getInstance().borgConfig
return configurationInfo
}
@PostMapping("config")
fun setConfig(@RequestBody configurationInfo: ConfigurationInfo) {
- val configurationHandler = ConfigurationHandler.getInstance()
- BorgInstallation.getInstance()
- .configure(configurationInfo.serverConfiguration, configurationInfo.borgVersion?.borgBinary)
+ log.info("server-config: ${configurationInfo.serverConfiguration}, borg-binary: ${configurationInfo.borgConfig?.borgBinary}")
+ BorgInstallation.getInstance().configure(configurationInfo.serverConfiguration, configurationInfo.borgConfig)
val configuration: ServerConfiguration = ServerConfiguration.get()
configurationInfo.serverConfiguration?.let {
configuration.copyFrom(it)
}
+ val configurationHandler = ConfigurationHandler.getInstance()
configurationHandler.save()
}
--
Gitblit v1.10.0