Refactor identifier field names

As tracked in #32 we want to have consistent naming for the identifier fields. This is better now.
owncloud · Jul 6, 2020 · b1bebcf · b1bebcf
1 parent 69693c5
commit b1bebcf
Show file tree

Hide file tree

Showing 16 changed files with 313 additions and 313 deletions.
diff --git a/Makefile b/Makefile
@@ -173,19 +173,19 @@ $(PROTO_SRC)/settings.pb.go: $(PROTO_SRC)/settings.proto
 	protoc \
 		-I=third_party/ \
 		-I=$(PROTO_SRC)/ \
-		--go_out=$(PROTO_SRC) settings.proto
+		--go_out=. settings.proto
 
 $(PROTO_SRC)/settings.pb.micro.go: $(PROTO_SRC)/settings.proto
 	protoc \
 		-I=third_party/ \
 		-I=$(PROTO_SRC)/ \
-		--micro_out=$(PROTO_SRC) settings.proto
+		--micro_out=. settings.proto
 
 $(PROTO_SRC)/settings.pb.web.go: $(PROTO_SRC)/settings.proto
 	protoc \
 		-I=third_party/ \
 		-I=$(PROTO_SRC)/ \
-		--microweb_out=$(PROTO_SRC) settings.proto
+		--microweb_out=. settings.proto
 
 $(PROTO_SRC)/settings.swagger.json: $(PROTO_SRC)/settings.proto
 	protoc \

diff --git a/pkg/assets/embed.go b/pkg/assets/embed.go
diff --git a/pkg/flagset/flagset.go b/pkg/flagset/flagset.go
@@ -159,6 +159,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "mount-path",
+			Value:       "/var/tmp/ocis-settings",
 			Usage:       "Mount path for the storage",
 			EnvVars:     []string{"SETTINGS_ROOT_MOUNT_PATH"},
 			Destination: &cfg.Storage.RootMountPath,

diff --git a/pkg/proto/v0/settings.pb.go b/pkg/proto/v0/settings.pb.go