diff --git a/.config/example.yml b/.config/example.yml index b7b56f2287..3f0ce40311 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -62,16 +62,6 @@ redis: #prefix: example-prefix #db: 1 -# ┌─────────────────────────────┐ -#───┘ Elasticsearch configuration └───────────────────────────── - -#elasticsearch: -# host: localhost -# port: 9200 -# ssl: false -# user: -# pass: - # ┌─────────────────────┐ #───┘ Sonic configuration └───────────────────────────────────── @@ -82,6 +72,16 @@ redis: # collection: notes # bucket: default +# ┌─────────────────────────────┐ +#───┘ Elasticsearch configuration └───────────────────────────── + +#elasticsearch: +# host: localhost +# port: 9200 +# ssl: false +# user: +# pass: + # ┌───────────────┐ #───┘ ID generation └─────────────────────────────────────────── diff --git a/docs/docker.md b/docs/docker.md index 1119b34f12..8c42ee54d7 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -14,7 +14,7 @@ There is a `docker-compose.yml` in the root of the project that you can use to b Rename the files: -`cp .config/default_example.yml .config/default.yml` +`cp .config/example.yml .config/default.yml` `cp .config/example.env .config/docker.env` @@ -23,6 +23,7 @@ You can configure `docker.env` with anything you like, but you will have to pay - `url` should be set to the URL you will be hosting the web interface for the instance at. - `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *calckey_db_1*), and the others should match your `docker.env`. - `host`will need to be configured in the *Redis configuration* section - it is the name of the redis container (eg: *calckey_redis_1*) +- `auth` will need to be configured in the *Sonic* section - cannot be the default `SecretPassword` Everything else can be left as-is.