Merge pull request #808 from owncloud/fix-672

Use copy of config instead of modifying the original configuration

accounts/pkg/command/server.go

@@ -57,8 +57,8 @@ func Server(cfg *config.Config) *cli.Command {
 					http.Context(ctx),
 					http.Config(cfg),
 					http.Metrics(mtrcs),
-					http.Flags(flagset.RootWithConfig(cfg)),
-					http.Flags(flagset.ServerWithConfig(cfg)),
+					http.Flags(flagset.RootWithConfig(config.New())),
+					http.Flags(flagset.ServerWithConfig(config.New())),
 					http.Handler(handler),
 				)
 

changelog/unreleased/fix-672.md

@@ -0,0 +1,7 @@
+Bugfix: Accounts config sometimes being overwritten
+
+Tags: accounts
+
+Sometimes when running the accounts extensions flags were not being taken into consideration.
+
+https://github.com/owncloud/ocis/pull/808

settings/pkg/command/server.go

@@ -2,12 +2,13 @@ package command
 
 import (
 	"context"
-	"github.com/owncloud/ocis/settings/pkg/metrics"
 	"os"
 	"os/signal"
 	"strings"
 	"time"
 
+	"github.com/owncloud/ocis/settings/pkg/metrics"
+
 	"contrib.go.opencensus.io/exporter/jaeger"
 	"contrib.go.opencensus.io/exporter/ocagent"
 	"contrib.go.opencensus.io/exporter/zipkin"
@@ -143,8 +144,8 @@ func Server(cfg *config.Config) *cli.Command {
 					http.Context(ctx),
 					http.Config(cfg),
 					http.Metrics(mtrcs),
-					http.Flags(flagset.RootWithConfig(cfg)),
-					http.Flags(flagset.ServerWithConfig(cfg)),
+					http.Flags(flagset.RootWithConfig(config.New())),
+					http.Flags(flagset.ServerWithConfig(config.New())),
 				)
 
 				gr.Add(server.Run, func(_ error) {

webdav/pkg/command/server.go

@@ -139,8 +139,8 @@ func Server(cfg *config.Config) *cli.Command {
 					http.Context(ctx),
 					http.Config(cfg),
 					http.Metrics(metrics),
-					http.Flags(flagset.RootWithConfig(cfg)),
-					http.Flags(flagset.ServerWithConfig(cfg)),
+					http.Flags(flagset.RootWithConfig(config.New())),
+					http.Flags(flagset.ServerWithConfig(config.New())),
 				)
 
 				if err != nil {