Преглед изворни кода

Minor wording improvements

pull/6/head
Slavi Pantaleev пре 7 година
родитељ
комит
617712000e
4 измењених фајлова са 4 додато и 4 уклоњено
  1. +1
    -1
      docs/configuring-playbook-own-webserver.md
  2. +1
    -1
      docs/configuring-playbook.md
  3. +1
    -1
      roles/matrix-server/templates/nginx-conf.d/matrix-riot-web.conf.j2
  4. +1
    -1
      roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2

+ 1
- 1
docs/configuring-playbook-own-webserver.md Прегледај датотеку

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



+ 1
- 1
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.



+ 1
- 1
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 %}



+ 1
- 1
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 %}



Loading…
Откажи
Сачувај