From 8d80b5ca255e49d3b3f4eb7f411902342248b0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?= Date: Tue, 5 Nov 2024 14:27:01 +0100 Subject: [PATCH] fix: remove obsolete configuration option --- services/collaboration/pkg/config/app.go | 1 - services/collaboration/pkg/config/defaults/defaultconfig.go | 1 - services/collaboration/pkg/connector/fileconnector_test.go | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/collaboration/pkg/config/app.go b/services/collaboration/pkg/config/app.go index d22e0d43c5..7477c8a2b8 100644 --- a/services/collaboration/pkg/config/app.go +++ b/services/collaboration/pkg/config/app.go @@ -6,7 +6,6 @@ type App struct { Product string `yaml:"product" env:"COLLABORATION_APP_PRODUCT" desc:"The WebOffice app, either Collabora, OnlyOffice, Microsoft365 or MicrosoftOfficeOnline" introductionVersion:"%%NEXT%%"` Description string `yaml:"description" env:"COLLABORATION_APP_DESCRIPTION" desc:"App description" introductionVersion:"6.0.0"` Icon string `yaml:"icon" env:"COLLABORATION_APP_ICON" desc:"Icon for the app" introductionVersion:"6.0.0"` - LockName string `yaml:"lockname" env:"COLLABORATION_APP_LOCKNAME" desc:"Name for the app lock" introductionVersion:"6.0.0"` Addr string `yaml:"addr" env:"COLLABORATION_APP_ADDR" desc:"The URL where the WOPI app is located, such as https://127.0.0.1:8080." introductionVersion:"6.0.0"` Insecure bool `yaml:"insecure" env:"COLLABORATION_APP_INSECURE" desc:"Skip TLS certificate verification when connecting to the WOPI app" introductionVersion:"6.0.0"` diff --git a/services/collaboration/pkg/config/defaults/defaultconfig.go b/services/collaboration/pkg/config/defaults/defaultconfig.go index 8287fcd00f..1b22b43480 100644 --- a/services/collaboration/pkg/config/defaults/defaultconfig.go +++ b/services/collaboration/pkg/config/defaults/defaultconfig.go @@ -27,7 +27,6 @@ func DefaultConfig() *config.Config { Product: "Collabora", Description: "Open office documents with Collabora", Icon: "image-edit", - LockName: "com.github.owncloud.collaboration", Addr: "https://127.0.0.1:9980", Insecure: false, ProofKeys: config.ProofKeys{ diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go index b0f48586f5..48af17915f 100644 --- a/services/collaboration/pkg/connector/fileconnector_test.go +++ b/services/collaboration/pkg/connector/fileconnector_test.go @@ -46,9 +46,8 @@ var _ = Describe("FileConnector", func() { OcisURL: "https://ocis.example.prv", }, App: config.App{ - LockName: "testName_for_unittests", // Only the LockName is used - Name: "test", - Product: "Microsoft", + Name: "test", + Product: "Microsoft", }, Wopi: config.Wopi{ WopiSrc: "https://ocis.server.prv",