From 5bfd22d13b75072bdb5b4d66d944f82ef026b861 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 24 May 2019 08:06:42 +0900 Subject: [PATCH] Fix incorrect inventory host_vars paths --- docs/configuring-playbook-dimension.md | 6 +++--- docs/configuring-playbook-external-postgres.md | 2 +- docs/configuring-playbook-federation.md | 6 +++--- docs/configuring-playbook-own-webserver.md | 4 ++-- docs/configuring-playbook-s3.md | 2 +- examples/apache/README.md | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md index f6a7779f6..eb6d06125 100644 --- a/docs/configuring-playbook-dimension.md +++ b/docs/configuring-playbook-dimension.md @@ -9,7 +9,7 @@ For an Integration Manager like [Dimension](https://dimension.t2bot.io) to work, Other important prerequisite is the `dimension.` DNS record being set up correctly. See [Configuring your DNS server](configuring-dns.md) on how to set up DNS record correctly. ## Enable -[Dimension integrations manager](https://dimension.t2bot.io) installation is disabled by default. You can enable it in your configuration file (`inventory/matrix./vars.yml`): +[Dimension integrations manager](https://dimension.t2bot.io) installation is disabled by default. You can enable it in your configuration file (`inventory/host_vars/matrix./vars.yml`): ```yaml matrix_dimension_enabled: true @@ -18,7 +18,7 @@ matrix_dimension_enabled: true ## Define admin users These users can modify the integrations this Dimension supports. Admin interface is accessible by opening Dimension in Riot and clicking the settings icon. -Add this to your configuration file (`inventory/matrix./vars.yml`): +Add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): ```yaml matrix_dimension_admins: ['@user1:domain.com', '@user2:domain.com'] @@ -37,7 +37,7 @@ To get an access token, follow these steps: **Access tokens are sensitive information. Do not include them in any bug reports, messages, or logs. Do not share the access token with anyone.** -Add access token to your configuration file (`inventory/matrix./vars.yml`): +Add access token to your configuration file (`inventory/host_vars/matrix./vars.yml`): ```yaml matrix_dimension_access_token: "YOUR ACCESS TOKEN HERE" diff --git a/docs/configuring-playbook-external-postgres.md b/docs/configuring-playbook-external-postgres.md index c988cfeca..f3671a641 100644 --- a/docs/configuring-playbook-external-postgres.md +++ b/docs/configuring-playbook-external-postgres.md @@ -3,7 +3,7 @@ By default, this playbook would set up a PostgreSQL database server on your machine, running in a Docker container. If that's alright, you can skip this. -If you'd like to use an external PostgreSQL server that you manage, you can edit your configuration file (`inventory/matrix./vars.yml`). +If you'd like to use an external PostgreSQL server that you manage, you can edit your configuration file (`inventory/host_vars/matrix./vars.yml`). It should be something like this: ```yaml diff --git a/docs/configuring-playbook-federation.md b/docs/configuring-playbook-federation.md index 1906f37d0..ad818ab24 100644 --- a/docs/configuring-playbook-federation.md +++ b/docs/configuring-playbook-federation.md @@ -6,7 +6,7 @@ That is, people on your server can communicate with people on any other Matrix s ## Federating only with select servers -To make your server only federate with servers of your choosing, add this to your configuration file (`inventory/matrix./vars.yml`): +To make your server only federate with servers of your choosing, add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): ```yaml matrix_synapse_federation_domain_whitelist: @@ -19,10 +19,10 @@ If you wish to disable federation, you can do that with an empty list (`[]`), or ## Disabling federation -To completely disable federation, isolating your server from the rest of the Matrix network, add this to your configuration file (`inventory/matrix./vars.yml`): +To completely disable federation, isolating your server from the rest of the Matrix network, add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): ```yaml matrix_synapse_federation_enabled: false ``` -With that, your server's users will only be able to talk among themselves, but not to anyone who is on another server. \ No newline at end of file +With that, your server's users will only be able to talk among themselves, but not to anyone who is on another server. diff --git a/docs/configuring-playbook-own-webserver.md b/docs/configuring-playbook-own-webserver.md index 1f4ff863f..267734366 100644 --- a/docs/configuring-playbook-own-webserver.md +++ b/docs/configuring-playbook-own-webserver.md @@ -13,13 +13,13 @@ No matter which external webserver you decide to go with, you'll need to: 1) Make sure your web server user (something like `http`, `apache`, `www-data`, `nginx`) is part of the `matrix` group. You should run something like this: `usermod -a -G matrix nginx` -2) Edit your configuration file (`inventory/matrix./vars.yml`) to disable the integrated nginx server: +2) Edit your configuration file (`inventory/host_vars/matrix./vars.yml`) to disable the integrated nginx server: ```yaml matrix_nginx_proxy_enabled: false ``` -3) **If you'll manage SSL certificates by yourself**, edit your configuration file (`inventory/matrix./vars.yml`) to disable SSL certificate retrieval: +3) **If you'll manage SSL certificates by yourself**, edit your configuration file (`inventory/host_vars/matrix./vars.yml`) to disable SSL certificate retrieval: ```yaml matrix_ssl_retrieval_method: none diff --git a/docs/configuring-playbook-s3.md b/docs/configuring-playbook-s3.md index ca6701a8a..ed7c4d926 100644 --- a/docs/configuring-playbook-s3.md +++ b/docs/configuring-playbook-s3.md @@ -29,7 +29,7 @@ You'll need an Amazon S3 bucket and some IAM user credentials (access key + secr } ``` -You then need to enable S3 support in your configuration file (`inventory/matrix./vars.yml`). +You then need to enable S3 support in your configuration file (`inventory/host_vars/matrix./vars.yml`). It would be something like this: ```yaml diff --git a/examples/apache/README.md b/examples/apache/README.md index 33183b9c6..92d7d932d 100644 --- a/examples/apache/README.md +++ b/examples/apache/README.md @@ -6,7 +6,7 @@ This is for when you wish to have your own Apache webserver sitting in front of See the [Using your own webserver, instead of this playbook's nginx proxy](../../docs/configuring-playbook-own-webserver.md) documentation page. To use your own Apache reverse-proxy, you first need to disable the integrated nginx server. -You do that with the following custom configuration (`inventory/matrix./vars.yml`): +You do that with the following custom configuration (`inventory/host_vars/matrix./vars.yml`): ```yaml matrix_nginx_proxy_enabled: false