sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use service user / hardcode idp

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2022-03-15 10:37:34 +01:00
parent edf845225a
commit b7c934b1b1
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -71,7 +71,7 @@ func DefaultConfig() *config.Config {
}, },
ServiceUser: config.ServiceUser{ ServiceUser: config.ServiceUser{
UUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad", UUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
Username: "", Username: "service user",
UID: 0, UID: 0,
GID: 0, GID: 0,
}, },
settings/pkg/config/config.go
+1 -1
View File
@@ -40,6 +40,6 @@ type Metadata struct {
StorageAddress string `ocisConfig:"storage_addr" env:"STORAGE_GRPC_ADDR"` StorageAddress string `ocisConfig:"storage_addr" env:"STORAGE_GRPC_ADDR"`
ServiceUserID string `ocisConfig:"service_user_id" env:"METADATA_SERVICE_USER_UUID"` 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"` MachineAuthAPIKey string `ocisConfig:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY"`
} }
settings/pkg/config/defaults/defaultconfig.go
+2 -3
View File
@@ -1,7 +1,6 @@
package defaults package defaults
import ( import (
"os"
"path" "path"
"strings" "strings"
@@ -58,8 +57,8 @@ func DefaultConfig() *config.Config {
Metadata: config.Metadata{ Metadata: config.Metadata{
GatewayAddress: "127.0.0.1:9142", GatewayAddress: "127.0.0.1:9142",
StorageAddress: "127.0.0.1:9215", StorageAddress: "127.0.0.1:9215",
ServiceUserID: "ddc2004c-0977-11eb-9d3f-a793888cd0f8", ServiceUserID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
ServiceUserIDP: os.Getenv("OCIS_URL"), ServiceUserIDP: "https://localhost:9200",
MachineAuthAPIKey: "change-me-please", MachineAuthAPIKey: "change-me-please",
}, },
} }