From bb47b67aa9ac4e12cd6f44d12abcec4329e7d615 Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:55:30 +0000 Subject: [PATCH] commit 5a67a2098c1cf0c86c0426bab27b64d22e9ac61c Merge: b0ea1deb d54f75df Author: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Tue Mar 15 21:49:58 2022 +0100 Merge pull request #3232 from kobergj/StoreSettingsViaMetadata [full-ci] Store settings via metadata --- extensions/_includes/accounts-config-example.yaml | 2 +- extensions/_includes/accounts_configvars.md | 2 +- extensions/_includes/settings-config-example.yaml | 7 +++++++ extensions/_includes/settings_configvars.md | 6 ++++++ grpc_apis/ocis/messages/accounts/v0/grpc.md | 2 +- grpc_apis/ocis/messages/settings/v0/grpc.md | 2 +- grpc_apis/ocis/messages/store/v0/grpc.md | 2 +- grpc_apis/ocis/messages/thumbnails/v0/grpc.md | 2 +- grpc_apis/ocis/services/accounts/v0/grpc.md | 2 +- grpc_apis/ocis/services/settings/v0/grpc.md | 2 +- grpc_apis/ocis/services/store/v0/grpc.md | 2 +- grpc_apis/ocis/services/thumbnails/v0/grpc.md | 2 +- 12 files changed, 23 insertions(+), 10 deletions(-) diff --git a/extensions/_includes/accounts-config-example.yaml b/extensions/_includes/accounts-config-example.yaml index 7ecc5b04f85..fa181e04ef0 100644 --- a/extensions/_includes/accounts-config-example.yaml +++ b/extensions/_includes/accounts-config-example.yaml @@ -56,7 +56,7 @@ index: upper: 1000 serviceuser: uuid: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad - username: "" + username: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad uid: 0 gid: 0 hashdifficulty: 11 diff --git a/extensions/_includes/accounts_configvars.md b/extensions/_includes/accounts_configvars.md index 9599bea4050..77d004a4487 100644 --- a/extensions/_includes/accounts_configvars.md +++ b/extensions/_includes/accounts_configvars.md @@ -20,7 +20,7 @@ | ACCOUNTS_GID_INDEX_LOWER_BOUND | int64 | 0 | The lowest possible gid value for the indexer.| | ACCOUNTS_GID_INDEX_UPPER_BOUND | int64 | 1000 | The highest possible gid value for the indexer.| | ACCOUNTS_SERVICE_USER_UUID | string | 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad | The id of the accounts service user.| -| ACCOUNTS_SERVICE_USER_USERNAME | string | | The username of the accounts service user.| +| ACCOUNTS_SERVICE_USER_USERNAME | string | 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad | The username of the accounts service user.| | ACCOUNTS_SERVICE_USER_UID | int64 | 0 | The uid of the accounts service user.| | ACCOUNTS_SERVICE_USER_GID | int64 | 0 | The gid of the accounts service user.| | ACCOUNTS_HASH_DIFFICULTY | int | 11 | The hash difficulty makes sure that validating a password takes at least a certain amount of time.| diff --git a/extensions/_includes/settings-config-example.yaml b/extensions/_includes/settings-config-example.yaml index 23c6827b9e9..5bb119527e7 100644 --- a/extensions/_includes/settings-config-example.yaml +++ b/extensions/_includes/settings-config-example.yaml @@ -37,7 +37,14 @@ http: allowcredentials: true grpc: addr: 127.0.0.1:9191 +storetype: metadata datapath: ~/.ocis/settings +metadata: + gatewayaddress: 127.0.0.1:9142 + storageaddress: 127.0.0.1:9215 + serviceuserid: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad + serviceuseridp: https://localhost:9200 + machineauthapikey: change-me-please asset: path: "" tokenmanager: diff --git a/extensions/_includes/settings_configvars.md b/extensions/_includes/settings_configvars.md index c8136208e16..3b788a0251a 100644 --- a/extensions/_includes/settings_configvars.md +++ b/extensions/_includes/settings_configvars.md @@ -10,6 +10,12 @@ | SETTINGS_HTTP_ROOT | string | / | | | SETTINGS_CACHE_TTL | int | 604800 | | | SETTINGS_GRPC_ADDR | string | 127.0.0.1:9191 | | +| SETTINGS_STORE_TYPE | string | metadata | | | SETTINGS_DATA_PATH | string | ~/.ocis/settings | | +| STORAGE_GATEWAY_GRPC_ADDR | string | 127.0.0.1:9142 | | +| STORAGE_GRPC_ADDR | string | 127.0.0.1:9215 | | +| METADATA_SERVICE_USER_UUID | string | 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad | | +| OCIS_URL;METADATA_SERVICE_USER_IDP | string | https://localhost:9200 | | +| OCIS_MACHINE_AUTH_API_KEY | string | change-me-please | | | SETTINGS_ASSET_PATH | string | | | | OCIS_JWT_SECRET;SETTINGS_JWT_SECRET | string | Pive-Fumkiu4 | | \ No newline at end of file diff --git a/grpc_apis/ocis/messages/accounts/v0/grpc.md b/grpc_apis/ocis/messages/accounts/v0/grpc.md index a4b9abf5caf..0be3dd37ff6 100644 --- a/grpc_apis/ocis/messages/accounts/v0/grpc.md +++ b/grpc_apis/ocis/messages/accounts/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.accounts.v0" url: /grpc_apis/ocis_messages_accounts_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md index f309c641d22..670d6375f74 100644 --- a/grpc_apis/ocis/messages/settings/v0/grpc.md +++ b/grpc_apis/ocis/messages/settings/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.settings.v0" url: /grpc_apis/ocis_messages_settings_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md index 936055722fe..102d607b230 100644 --- a/grpc_apis/ocis/messages/store/v0/grpc.md +++ b/grpc_apis/ocis/messages/store/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.store.v0" url: /grpc_apis/ocis_messages_store_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md index 839a82d9c7a..55668760285 100644 --- a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md +++ b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.thumbnails.v0" url: /grpc_apis/ocis_messages_thumbnails_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/accounts/v0/grpc.md b/grpc_apis/ocis/services/accounts/v0/grpc.md index 4f544dabfe3..47eb724a8fe 100644 --- a/grpc_apis/ocis/services/accounts/v0/grpc.md +++ b/grpc_apis/ocis/services/accounts/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.accounts.v0" url: /grpc_apis/ocis_services_accounts_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md index 328afeecfdc..bcba5915b98 100644 --- a/grpc_apis/ocis/services/settings/v0/grpc.md +++ b/grpc_apis/ocis/services/settings/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.settings.v0" url: /grpc_apis/ocis_services_settings_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md index fac5747b9a3..59e819949f2 100644 --- a/grpc_apis/ocis/services/store/v0/grpc.md +++ b/grpc_apis/ocis/services/store/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.store.v0" url: /grpc_apis/ocis_services_store_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md index 4da101eb613..08777899112 100644 --- a/grpc_apis/ocis/services/thumbnails/v0/grpc.md +++ b/grpc_apis/ocis/services/thumbnails/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.thumbnails.v0" url: /grpc_apis/ocis_services_thumbnails_v0 -date: 2022-03-15T20:27:21Z +date: 2022-03-15T20:54:38Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis ---