From 249d4eae97fa17c821a9d8abf9657936298b353e Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 11 Mar 2022 11:31:35 +0100 Subject: [PATCH] Fix the location of the identifier-registration.yaml. --- docs/ocis/deployment/basic-remote-setup.md | 6 ++++-- docs/ocis/deployment/bridge.md | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/ocis/deployment/basic-remote-setup.md b/docs/ocis/deployment/basic-remote-setup.md index efa76e1fdf5..4227a88e1f1 100644 --- a/docs/ocis/deployment/basic-remote-setup.md +++ b/docs/ocis/deployment/basic-remote-setup.md @@ -15,10 +15,12 @@ If you need to access oCIS running in a docker container, on a VM or a remote ma ## Start the oCIS fullstack server from binary -Upon first start of the oCIS fullstack server with `./bin/ocis server` it will generate a file `identifier-registration.yml` in the config folder in your current working directory. This file is used to configure the built-in identity provider and therefore contains the OpenID Connect issuer and also information about relying parties, for example ownCloud Web and our desktop and mobile applications. +Upon first start of the oCIS fullstack server with `./bin/ocis server` it will generate a directory tree skeleton in `$HOME/.ocis`. If that is already existing it will not be overwritten as it contains all relevant data for oCIS. + +In `$HOME/.ocis/idp` is a file `identifier-registration.yaml`. It is used to configure the built-in identity provider and therefore contains the OpenID Connect issuer and also information about relying parties, for example ownCloud Web and our desktop and mobile applications. {{< hint warning >}} -The `identifier-registration.yml` file will only be generated if it does not exist yet. If you want to change certain environment variables like `OCIS_URL`, please delete this file first before doing so. Otherwise your changes will not be applied correctly and you will run into errors. +The `identifier-registration.yaml` file will only be generated if it does not exist yet. If you want to change certain environment variables like `OCIS_URL`, please delete this file first before doing so. Otherwise your changes will not be applied correctly and you will run into errors. {{< /hint >}} {{< hint warning >}} diff --git a/docs/ocis/deployment/bridge.md b/docs/ocis/deployment/bridge.md index b291b1bfde1..2551ac0440f 100644 --- a/docs/ocis/deployment/bridge.md +++ b/docs/ocis/deployment/bridge.md @@ -92,9 +92,9 @@ basedn = "dc=ocis,dc=test" # base dn to construct {{< hint >}} There is a bug in the config merging for environment variables, cli flags and config files causing log settings not to be picked up from the config file when specifying `--extensions`. That is why I will -* configure most of the config in a file, +* configure most of the config in a file, * adjust logging using `OCIS_LOG_*` environment variables and -* specify which extension to run using `ocis/bin/ocis server --extensions "comma, separated, list, of, extensions"`. +* specify which extension to run using `ocis/bin/ocis server --extensions "comma, separated, list, of, extensions"`. {{< /hint >}} #### Run it! @@ -129,7 +129,7 @@ To configure LDAP to use our glauth we add this section to the config file: ```toml [storage.reva.ldap] idp = "https://ocis.ocis.test" -basedn = "dc=ocis,dc=test" +basedn = "dc=ocis,dc=test" binddn = "cn=admin,dc=ocis,dc=test" # an admin user in your oc10 bindpassword = "secret" userschema = { uid = "uid", displayname = "givenname" } # TODO make glauth return an ownclouduuid and displayname attribute @@ -158,7 +158,7 @@ Please use `exit` or `Ctrl-D` to exit this program. username: jfd password: OK >> whoami -id: username:"jfd" mail:"jfd@butonic.de" display_name:"J\303\266rn" uid_number:99 gid_number:99 +id: username:"jfd" mail:"jfd@butonic.de" display_name:"J\303\266rn" uid_number:99 gid_number:99 >> exit ```