finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor wording improvements

Browse Source
This commit is contained in:
Slavi Pantaleev 2018-08-15 10:19:31 +03:00
parent dcf19154b2
commit 617712000e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuring-playbook-own-webserver.md
View File

@ -12,7 +12,7 @@ All it takes is editing your configuration file (`inventory/matrix.<your-domain>
matrix_nginx_proxy_enabled: false 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;` **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;`

2
docs/configuring-playbook.md
View File

@ -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. 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.

2
roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2
View File

@ -46,7 +46,7 @@ server {
set $backend "matrix-riot-web:8765"; set $backend "matrix-riot-web:8765";
proxy_pass http://$backend; proxy_pass http://$backend;
{% else %} {% 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; proxy_pass http://localhost:8765;
{% endif %} {% endif %}

2
roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2
View File

@ -46,7 +46,7 @@ server {
set $backend "matrix-synapse:8008"; set $backend "matrix-synapse:8008";
proxy_pass http://$backend; proxy_pass http://$backend;
{% else %} {% 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; proxy_pass http://localhost:8008;
{% endif %} {% endif %}