From 617712000ebd5c1c2a0898e625184545684af947 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 15 Aug 2018 10:19:31 +0300 Subject: [PATCH] Minor wording improvements --- docs/configuring-playbook-own-webserver.md | 2 +- docs/configuring-playbook.md | 2 +- .../templates/nginx-conf.d/matrix-riot-web.conf.j2 | 2 +- .../matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/configuring-playbook-own-webserver.md b/docs/configuring-playbook-own-webserver.md index ba6d8938..112e8918 100644 --- a/docs/configuring-playbook-own-webserver.md +++ b/docs/configuring-playbook-own-webserver.md @@ -12,7 +12,7 @@ All it takes is editing your configuration file (`inventory/matrix. matrix_nginx_proxy_enabled: false ``` -**Note**: even if you do this, in order [to install](#installing), this playbook still expects port 80 to be available. **Please manually stop your other webserver while installing**. You can start it back again afterwards. +**Note**: even if you do this, in order [to install](installing.md), this playbook still expects port 80 to be available. **Please manually stop your other webserver while installing**. You can start it back again afterwards. **If your own webserver is nginx**, you can most likely directly use the config files installed by this playbook at: `/matrix/nginx-proxy/conf.d`. Just include them in your `nginx.conf` like this: `include /matrix/nginx-proxy/conf.d/*.conf;` diff --git a/docs/configuring-playbook.md b/docs/configuring-playbook.md index 682afa54..a83d2742 100644 --- a/docs/configuring-playbook.md +++ b/docs/configuring-playbook.md @@ -1,4 +1,4 @@ -# Configuration the Ansible playbook +# Configuring the Ansible playbook Once you have your server and you have [configured your DNS records](configuring-dns.md#configuring-dns), you can proceed with configuring this playbook, so that it knows what to install and where. diff --git a/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2 b/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2 index c24daeda..43067514 100644 --- a/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2 +++ b/roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2 @@ -46,7 +46,7 @@ server { set $backend "matrix-riot-web:8765"; proxy_pass http://$backend; {% else %} - {# Generic configuration for people to use outside of our container setup #} + {# Generic configuration for use outside of our container setup #} proxy_pass http://localhost:8765; {% endif %} diff --git a/roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2 b/roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2 index 25276fa4..300705a0 100644 --- a/roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2 +++ b/roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2 @@ -46,7 +46,7 @@ server { set $backend "matrix-synapse:8008"; proxy_pass http://$backend; {% else %} - {# Generic configuration for people to use outside of our container setup #} + {# Generic configuration for use outside of our container setup #} proxy_pass http://localhost:8008; {% endif %}