use service user / hardcode idp

Signed-off-by: jkoberg <jkoberg@owncloud.com>
owncloud · Mar 15, 2022 · b7c934b · b7c934b
1 parent edf8452
commit b7c934b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/accounts/pkg/config/defaults/defaultconfig.go b/accounts/pkg/config/defaults/defaultconfig.go
@@ -71,7 +71,7 @@ func DefaultConfig() *config.Config {
  },
  ServiceUser: config.ServiceUser{
  UUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
- Username: "",
+ Username: "service user",
  UID: 0,
  GID: 0,
  },

diff --git a/settings/pkg/config/config.go b/settings/pkg/config/config.go
@@ -40,6 +40,6 @@ type Metadata struct {
  StorageAddress string `ocisConfig:"storage_addr" env:"STORAGE_GRPC_ADDR"`
 
  ServiceUserID string `ocisConfig:"service_user_id" env:"METADATA_SERVICE_USER_UUID"`
- ServiceUserIDP string `ocisConfig:"service_user_idp" env:"METADATA_SERVICE_USER_IDP"`
+ ServiceUserIDP string `ocisConfig:"service_user_idp" env:"OCIS_URL;METADATA_SERVICE_USER_IDP"`
  MachineAuthAPIKey string `ocisConfig:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY"`
 }
diff --git a/settings/pkg/config/defaults/defaultconfig.go b/settings/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,6 @@
 package defaults
 
 import (
- "os"
  "path"
  "strings"
 
@@ -58,8 +57,8 @@ func DefaultConfig() *config.Config {
  Metadata: config.Metadata{
  GatewayAddress: "127.0.0.1:9142",
  StorageAddress: "127.0.0.1:9215",
- ServiceUserID: "ddc2004c-0977-11eb-9d3f-a793888cd0f8",
- ServiceUserIDP: os.Getenv("OCIS_URL"),
+ ServiceUserID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
+ ServiceUserIDP: "https://localhost:9200",
  MachineAuthAPIKey: "change-me-please",
  },
  }