mirror/opencloud
1
0 Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-10-23 06:39:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into disable_out-of-date-check

Browse Source
This commit is contained in:
Willy Kloucek authored and GitHub committed 2021-01-29 16:46:40 +01:00
2 parents ce9177e21c b3062d1bd9
commit e69e2213e4
2 files changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

idp/cmd/konnectd/main.go → idp/cmd/idp/main.go
View File
File renamed without changes.
idp/templates/CONFIGURATION.tmpl
+1 -1
View File
@@ -35,7 +35,7 @@ $HOME/.ocis
For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-idp reads `idp.json | yaml | toml ...`*.
So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/konnectd/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`.
So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/idp/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`.
### Environment variables