From d1bfb73f9639bbb69ebbe10df67004107714d7d8 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 13 Nov 2024 13:06:13 +0100 Subject: [PATCH 1/2] remove tmpfile if no diff changes present Signed-off-by: Christian Richter --- ocis/pkg/init/functions.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ocis/pkg/init/functions.go b/ocis/pkg/init/functions.go index a76fda120..8961dd9d0 100644 --- a/ocis/pkg/init/functions.go +++ b/ocis/pkg/init/functions.go @@ -86,6 +86,10 @@ func writePatch(configPath string, yamlOutput []byte) error { cmd := exec.Command("diff", "-u", path.Join(configPath, configFilename), tmpFile) stdout, err := cmd.Output() if err == nil { + err = os.Remove(tmpFile) + if err != nil { + return err + } fmt.Println("no changes, your config is up to date") return nil } From 30f8409b34e0c9339917bd08a01029e04494ecac Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 13 Nov 2024 13:06:30 +0100 Subject: [PATCH 2/2] generate collaborationWOPISecret if old config does not contain any Signed-off-by: Christian Richter --- ocis/pkg/init/init.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go index 5c837774f..0808e4cb4 100644 --- a/ocis/pkg/init/init.go +++ b/ocis/pkg/init/init.go @@ -83,6 +83,12 @@ func CreateConfig(insecure, forceOverwrite, diff bool, configPath, adminPassword revaServicePassword = oldCfg.Idm.ServiceUserPasswords.RevaPassword tokenManagerJwtSecret = oldCfg.TokenManager.JWTSecret collaborationWOPISecret = oldCfg.Collaboration.WopiApp.Secret + if collaborationWOPISecret == "" { + collaborationWOPISecret, err = generators.GenerateRandomPassword(passwordLength) + if err != nil { + return fmt.Errorf("could not generate random wopi secret for collaboration service: %s", err) + } + } machineAuthAPIKey = oldCfg.MachineAuthAPIKey systemUserAPIKey = oldCfg.SystemUserAPIKey revaTransferSecret = oldCfg.TransferSecret