From f2a1c0614546a614787edfc353ad40026945a26d Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 17 Nov 2020 11:05:14 +0100 Subject: [PATCH] fix typos, force oCIS and add links --- accounts/templates/CONFIGURATION.tmpl | 2 +- docs/_index.md | 18 +++++--- docs/extensions/accounts/_index.md | 2 +- docs/extensions/accounts/getting-started.md | 46 ------------------- .../ocis-phoenix/getting-started.md | 2 +- docs/extensions/ocis-phoenix/releasing.md | 2 +- docs/extensions/proxy/_index.md | 2 +- docs/extensions/settings/getting-started.md | 2 +- docs/extensions/settings/glossary.md | 2 +- docs/extensions/store/getting-started.md | 2 +- docs/extensions/thumbnails/getting-started.md | 2 +- docs/extensions/webdav/getting-started.md | 2 +- docs/ocis/_index.md | 18 ++++---- docs/ocis/deployment/ocis_oc10_backend.md | 2 +- docs/ocis/deployment/ocis_traefik.md | 2 +- docs/ocis/development/building.md | 4 +- docs/ocis/development/getting-started.md | 2 +- docs/ocis/development/testing.md | 2 +- docs/ocis/eos.md | 2 +- glauth/templates/CONFIGURATION.tmpl | 2 +- konnectd/templates/CONFIGURATION.tmpl | 2 +- ocis-phoenix/templates/CONFIGURATION.tmpl | 2 +- ocis/docker/eos-ocis-dev/README.md | 2 +- ocis/docker/eos-ocis/README.md | 2 +- ocs/templates/CONFIGURATION.tmpl | 2 +- proxy/templates/CONFIGURATION.tmpl | 2 +- settings/templates/CONFIGURATION.tmpl | 2 +- storage/templates/CONFIGURATION.tmpl | 2 +- store/templates/CONFIGURATION.tmpl | 2 +- thumbnails/templates/CONFIGURATION.tmpl | 2 +- webdav/templates/CONFIGURATION.tmpl | 2 +- 31 files changed, 49 insertions(+), 91 deletions(-) diff --git a/accounts/templates/CONFIGURATION.tmpl b/accounts/templates/CONFIGURATION.tmpl index 595c23873c..c5d669edd8 100644 --- a/accounts/templates/CONFIGURATION.tmpl +++ b/accounts/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/docs/_index.md b/docs/_index.md index 81065208ac..be9104e36d 100644 --- a/docs/_index.md +++ b/docs/_index.md @@ -4,10 +4,15 @@ title: ownCloud ## Developer Documentation -Welcome to our developer documentation. Here you can find documentation for developers on -- The oCIS server +Welcome to our developer documentation. Here you can find developer documentation on: + +- [oCIS](https://owncloud.github.io/ocis/) server - oCIS extensions -- All Client, like Android, iOS, and the Desktop Client +- Clients, like: + - [Phoenix](https://github.com/owncloud/phoenix) - the new web frontend for oCIS and ownCloud + - [ownCloud Android app](https://github.com/owncloud/android) + - [ownCloud iOS app](https://github.com/owncloud/ios-app) + - [ownCloud Desktop Syncing Client](https://github.com/owncloud/client) - Integrations ## We love open source @@ -19,11 +24,10 @@ You can also find all client sources on github. ## Join us -The oCIS server repository on github is a good entrypoint for you to join the project. But we also develop clients for iOS, Android, Desktop and Web. +The oCIS server repository on github is a good entry point for you to join the project. But we also develop clients for iOS, Android, Desktop and Web. -For communication on development you can join our public chat https://talk.owncloud.com +For communication on development you can join our public chat [talk.owncloud.com](https://talk.owncloud.com) -If you want to help and improve ownCloud, start coding or open issues on github in the related repositiory. +If you want to help and improve ownCloud or oCIS, start coding or open issues on github in the related repository. We are very happy to hear your feedback and ideas! - diff --git a/docs/extensions/accounts/_index.md b/docs/extensions/accounts/_index.md index cdd6471286..c701c32eaf 100644 --- a/docs/extensions/accounts/_index.md +++ b/docs/extensions/accounts/_index.md @@ -8,7 +8,7 @@ geekdocFilePath: _index.md --- ## Abstract -OCIS needs to be able to identify users. Whithout a non reassignable and persistend account ID share metadata cannot be reliably persisted. `ocis-accounts` allows exchanging oidc claims for a uuid. Using a uuid allows users to change the login, mail or even openid connect provider without breaking any persisted metadata that might have been attached to it. +oCIS needs to be able to identify users. Without a non reassignable and persistent account ID share metadata cannot be reliably persisted. `accounts` allows exchanging oidc claims for a uuid. Using a uuid allows users to change the login, mail or even openid connect provider without breaking any persisted metadata that might have been attached to it. - persists accounts - uses graph api properties diff --git a/docs/extensions/accounts/getting-started.md b/docs/extensions/accounts/getting-started.md index 79842c93fb..fa2f567ba9 100644 --- a/docs/extensions/accounts/getting-started.md +++ b/docs/extensions/accounts/getting-started.md @@ -20,49 +20,3 @@ TBD ### Binaries TBD - -## Configuration - -We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. - -### Envrionment variables - -If you prefer to configure the service with environment variables you can see the available variables below. - -#### Server - -OCIS_ACCOUNTS_NAME -: Name of the accounts service. It will be part of the namespace. - -OCIS_ACCOUNTS_NAMESPACE -: Namespace of the accounts service. - -OCIS_ACCOUNTS_ADDRESS -: Endpoint for the grpc service endpoint. - -### Commandline flags - -If you prefer to configure the service with commandline flags you can see the available variables below. - -### Configuration file - -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/accounts/tree/master/pkg/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/accounts.yml`, `${HOME}/.ocis/accounts.yml` or `$(pwd)/config/accounts.yml`. - -## Usage - -The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis-accounts --help`. - -### Server - -The server command is used to start the grpc server. For further help please execute: - -{{< highlight txt >}} -accounts server --help -{{< / highlight >}} - -### Version -The version command lists the versions of all running instances. For further help please execute: - -{{< highlight txt >}} -accounts version --help -{{< /highlight >}} diff --git a/docs/extensions/ocis-phoenix/getting-started.md b/docs/extensions/ocis-phoenix/getting-started.md index 95d57baa94..b35f10e81f 100644 --- a/docs/extensions/ocis-phoenix/getting-started.md +++ b/docs/extensions/ocis-phoenix/getting-started.md @@ -25,7 +25,7 @@ TBD We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/docs/extensions/ocis-phoenix/releasing.md b/docs/extensions/ocis-phoenix/releasing.md index 4d80122fcc..a0edfe8533 100644 --- a/docs/extensions/ocis-phoenix/releasing.md +++ b/docs/extensions/ocis-phoenix/releasing.md @@ -10,7 +10,7 @@ geekdocFilePath: releasing.md ## Releasing -The next generation Web Frontend is shipped as an ocis Extension. The `ocis-phoenix` extension is also embedded in the single binary and part of the `ocis server` command. +The next generation Web Frontend is shipped as an oCIS Extension. The `ocis-phoenix` extension is also embedded in the single binary and part of the `ocis server` command. To update this package within all the deliveries, we need to update the package in the following chain from the bottom to the top. diff --git a/docs/extensions/proxy/_index.md b/docs/extensions/proxy/_index.md index 71858199e0..541be599f3 100644 --- a/docs/extensions/proxy/_index.md +++ b/docs/extensions/proxy/_index.md @@ -5,4 +5,4 @@ geekdocEditPath: edit/master/docs/extensions/proxy geekdocFilePath: _index.md --- -This service provides a basic proxy in front of the public ocis services. +This service provides a basic proxy in front of the public oCIS services. diff --git a/docs/extensions/settings/getting-started.md b/docs/extensions/settings/getting-started.md index de39ce398c..571a825270 100644 --- a/docs/extensions/settings/getting-started.md +++ b/docs/extensions/settings/getting-started.md @@ -25,7 +25,7 @@ TBD We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/docs/extensions/settings/glossary.md b/docs/extensions/settings/glossary.md index fe01c773ae..4e7afb8386 100644 --- a/docs/extensions/settings/glossary.md +++ b/docs/extensions/settings/glossary.md @@ -32,7 +32,7 @@ In the context of this extension and oCIS in general, we are using the following ### Settings Bundle - Collection of related settings -- Registered by an ocis extension +- Registered by an oCIS extension ### Settings Value diff --git a/docs/extensions/store/getting-started.md b/docs/extensions/store/getting-started.md index 6be81110d7..6bc739ebf3 100644 --- a/docs/extensions/store/getting-started.md +++ b/docs/extensions/store/getting-started.md @@ -25,7 +25,7 @@ TBD We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/docs/extensions/thumbnails/getting-started.md b/docs/extensions/thumbnails/getting-started.md index 544e29c527..99aee374ce 100644 --- a/docs/extensions/thumbnails/getting-started.md +++ b/docs/extensions/thumbnails/getting-started.md @@ -25,7 +25,7 @@ TBD We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/docs/extensions/webdav/getting-started.md b/docs/extensions/webdav/getting-started.md index 812a4eb995..d975cb3bcb 100644 --- a/docs/extensions/webdav/getting-started.md +++ b/docs/extensions/webdav/getting-started.md @@ -25,7 +25,7 @@ TBD We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. -#### Envrionment variables +#### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/docs/ocis/_index.md b/docs/ocis/_index.md index 59d02847f3..dc7040a772 100644 --- a/docs/ocis/_index.md +++ b/docs/ocis/_index.md @@ -1,5 +1,5 @@ --- -title: "oCIS" +title: "oCIS - ownCloud Infinite Scale" date: 2020-02-27T20:35:00+01:00 weight: -10 geekdocRepo: https://github.com/owncloud/ocis @@ -11,27 +11,27 @@ geekdocFilePath: _index.md ## ownCloud Infinite Scale -Welcome to oCIS! We develop a modern file-sync and share plattform, based on our knowledge and experience with the PHP ownCloud server project. +Welcome to oCIS, the modern file-sync and share platform, which is based on our knowledge and experience with the PHP based [ownCloud server](https://owncloud.com/#server). -### oCIS Server +### oCIS server -The oCIS server implementation follows go-lang best practices and is based on the [go-micro](https://go-micro.dev/) framework and [REVA](https://reva.link/). We love and stick to [12 Factor](https://12factor.net/). +The oCIS server implementation follows [Go](https://golang.org/) best practices and is based on the [go-micro](https://go-micro.dev/) framework and [REVA](https://reva.link/). We love and stick to [12 Factor](https://12factor.net/). oCIS is a micro-service based server, which allows scale-out of individual services to meet your specific performance requirements. -We run a huge test suite, which was originated in ownCloud 10 and continues to grow. +We run a huge [test suite](https://github.com/owncloud/core/tree/master/tests), which was originated in ownCloud 10 and continues to grow. ### Architecture Overview {{< mermaid class="text-center">}} graph TD -ocis-proxy --> - ocis-konnectd & ocis-phoenix & ocis-thumbnails & ocis-ocs & ocis-webdav +proxy --> + konnectd & ocis-phoenix & thumbnails & ocs & webdav ocis-phoenix --> ocis-reva-fronted ocis-reva-fronted --> ocis-reva-gateway -ocis-konnectd --> ocis-glauth +konnectd --> glauth -ocis-reva-gateway --> ocis-reva-users +ocis-reva-gateway --> accounts ocis-reva-gateway --> ocis-reva-authbasic ocis-reva-gateway --> ocis-reva-auth-bearer diff --git a/docs/ocis/deployment/ocis_oc10_backend.md b/docs/ocis/deployment/ocis_oc10_backend.md index b89405271a..3a2e28ff71 100644 --- a/docs/ocis/deployment/ocis_oc10_backend.md +++ b/docs/ocis/deployment/ocis_oc10_backend.md @@ -57,7 +57,7 @@ The described setup can also be used to do a zero-downtime migration from ownClo `$ sudo chmod +x /usr/local/bin/docker-compose` -* Environment variables for OCIS Stack are provided by .env file +* Environment variables for oCIS Stack are provided by .env file ### Setup on server diff --git a/docs/ocis/deployment/ocis_traefik.md b/docs/ocis/deployment/ocis_traefik.md index 8a4aabfc43..8d496768e8 100644 --- a/docs/ocis/deployment/ocis_traefik.md +++ b/docs/ocis/deployment/ocis_traefik.md @@ -49,7 +49,7 @@ geekdocFilePath: ocis_traefik.md `$ sudo chmod +x /usr/local/bin/docker-compose` -* Environment variables for OCIS Stack are provided by .env file +* Environment variables for oCIS Stack are provided by .env file ### Setup on server diff --git a/docs/ocis/development/building.md b/docs/ocis/development/building.md index b4551d90e0..190af94a47 100644 --- a/docs/ocis/development/building.md +++ b/docs/ocis/development/building.md @@ -20,9 +20,9 @@ git clone https://github.com/owncloud/ocis.git cd ocis {{< / highlight >}} -## Build the ocis binary +## Build the oCIS binary -The ocis binary source is in the ocis/ocis folder. In this folder you can build the ocis binary: +The oCIS binary source is in the ocis/ocis folder. In this folder you can build the ocis binary: {{< highlight txt >}} make generate diff --git a/docs/ocis/development/getting-started.md b/docs/ocis/development/getting-started.md index 679dd7f2be..b87370d0d0 100644 --- a/docs/ocis/development/getting-started.md +++ b/docs/ocis/development/getting-started.md @@ -19,7 +19,7 @@ To build and run your local ocis code with default storage driver docker run --rm -ti --name ocis -v $PWD:/ocis -p 9200:9200 owncloud/eos-ocis-dev ``` -The eos-ocis-dev container will build and run ocis using the owncloud storage driver and store files in the container at `/var/tmp/reva/data//files` +The eos-ocis-dev container will build and run oCIS using the ownCloud storage driver and store files in the container at `/var/tmp/reva/data//files` To check the uploaded files start digging with: `docker exec -it ocis ls -l /var/tmp/reva/` diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md index 3fd74cce3f..329a8c263b 100644 --- a/docs/ocis/development/testing.md +++ b/docs/ocis/development/testing.md @@ -10,7 +10,7 @@ geekdocFilePath: testing.md ## Acceptance tests -We are using the ownCloud 10 acceptance testsuite against ocis. To set this up you need the owncloud 10 core repo, a ldap server that the acceptance tests can use to manage users, a redis server for file-versions and the ocis code. +We are using the ownCloud 10 acceptance testsuite against ocis. To set this up you need the owncloud 10 core repo, a ldap server that the acceptance tests can use to manage users, a redis server for file-versions and the oCIS code. ### Getting the tests diff --git a/docs/ocis/eos.md b/docs/ocis/eos.md index ff1b94b39a..8801b44ae5 100644 --- a/docs/ocis/eos.md +++ b/docs/ocis/eos.md @@ -9,7 +9,7 @@ geekdocFilePath: eos.md {{< toc >}} -OCIS can be configured to run on top of [eos](https://eos.web.cern.ch/). While the [eos documentation](http://eos-docs.web.cern.ch/) does cover a lot of topics it leaves out some details that you may have to either pull from various [docker containers](https://gitlab.cern.ch/eos/eos-docker), the [forums](https://eos-community.web.cern.ch/) or even the [source](https://github.com/cern-eos/eos) itself. +oCIS can be configured to run on top of [eos](https://eos.web.cern.ch/). While the [eos documentation](http://eos-docs.web.cern.ch/) does cover a lot of topics it leaves out some details that you may have to either pull from various [docker containers](https://gitlab.cern.ch/eos/eos-docker), the [forums](https://eos-community.web.cern.ch/) or even the [source](https://github.com/cern-eos/eos) itself. This document is a work in progress of the current setup. diff --git a/glauth/templates/CONFIGURATION.tmpl b/glauth/templates/CONFIGURATION.tmpl index 977db726fe..7b939478d0 100644 --- a/glauth/templates/CONFIGURATION.tmpl +++ b/glauth/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/konnectd/templates/CONFIGURATION.tmpl b/konnectd/templates/CONFIGURATION.tmpl index 445eec7e0f..928157c352 100644 --- a/konnectd/templates/CONFIGURATION.tmpl +++ b/konnectd/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/ocis-phoenix/templates/CONFIGURATION.tmpl b/ocis-phoenix/templates/CONFIGURATION.tmpl index 3b7584936c..7ae23b1c0b 100644 --- a/ocis-phoenix/templates/CONFIGURATION.tmpl +++ b/ocis-phoenix/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/ocis/docker/eos-ocis-dev/README.md b/ocis/docker/eos-ocis-dev/README.md index 6f4b3c384f..a2e6e9f7a7 100644 --- a/ocis/docker/eos-ocis-dev/README.md +++ b/ocis/docker/eos-ocis-dev/README.md @@ -1,4 +1,4 @@ -# Docker image for ocis development with eos +# Docker image for oCIS development with eos Image is based on [owncloud/eos-base](https://hub.docker.com/r/owncloud/eos-base) from [eos-stack](https://github.com/owncloud-docker/eos-stack) diff --git a/ocis/docker/eos-ocis/README.md b/ocis/docker/eos-ocis/README.md index bacad37384..b987ec27b6 100644 --- a/ocis/docker/eos-ocis/README.md +++ b/ocis/docker/eos-ocis/README.md @@ -1,4 +1,4 @@ -# Docker image for ocis running on eos +# Docker image for oCIS running on eos Image is based on [owncloud/eos-base](https://hub.docker.com/r/owncloud/eos-base) from [eos-stack](https://github.com/owncloud-docker/eos-stack) diff --git a/ocs/templates/CONFIGURATION.tmpl b/ocs/templates/CONFIGURATION.tmpl index a8138a4406..5c190dbe1e 100644 --- a/ocs/templates/CONFIGURATION.tmpl +++ b/ocs/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/proxy/templates/CONFIGURATION.tmpl b/proxy/templates/CONFIGURATION.tmpl index 32bf527d50..bedf5af16a 100644 --- a/proxy/templates/CONFIGURATION.tmpl +++ b/proxy/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/settings/templates/CONFIGURATION.tmpl b/settings/templates/CONFIGURATION.tmpl index 41797f6ee6..1e24058bf2 100644 --- a/settings/templates/CONFIGURATION.tmpl +++ b/settings/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/storage/templates/CONFIGURATION.tmpl b/storage/templates/CONFIGURATION.tmpl index a94a75dc42..096c42cfef 100644 --- a/storage/templates/CONFIGURATION.tmpl +++ b/storage/templates/CONFIGURATION.tmpl @@ -54,7 +54,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/store/templates/CONFIGURATION.tmpl b/store/templates/CONFIGURATION.tmpl index 7f63464e43..6b6ec0bf76 100644 --- a/store/templates/CONFIGURATION.tmpl +++ b/store/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/thumbnails/templates/CONFIGURATION.tmpl b/thumbnails/templates/CONFIGURATION.tmpl index 863eac694c..e45aa1ad52 100644 --- a/thumbnails/templates/CONFIGURATION.tmpl +++ b/thumbnails/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below. diff --git a/webdav/templates/CONFIGURATION.tmpl b/webdav/templates/CONFIGURATION.tmpl index ec4f2d0815..559344f674 100644 --- a/webdav/templates/CONFIGURATION.tmpl +++ b/webdav/templates/CONFIGURATION.tmpl @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com 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/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`. -### Envrionment variables +### Environment variables If you prefer to configure the service with environment variables you can see the available variables below.