Sfoglia il codice sorgente

Merge pull request #1394 from JokerGermany/master

Port 80 for IPv6
pull/1401/head
Slavi Pantaleev 4 anni fa
committed by GitHub
parent
commit
24fd455a9e
Non sono state trovate chiavi note per questa firma nel database ID Chiave GPG: 4AEE18F83AFDEB23
10 ha cambiato i file con 23 aggiunte e 4 eliminazioni
  1. +1
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-base-domain.conf.j2
  2. +3
    -1
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-bot-go-neb.conf.j2
  3. +2
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-client-element.conf.j2
  4. +2
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-client-hydrogen.conf.j2
  5. +3
    -1
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-dimension.conf.j2
  6. +2
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
  7. +4
    -2
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-grafana.conf.j2
  8. +2
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2
  9. +2
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-riot-web.conf.j2
  10. +2
    -0
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-sygnal.conf.j2

+ 1
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-base-domain.conf.j2 Vedi File

@@ -36,6 +36,7 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};


server_name {{ matrix_nginx_proxy_base_domain_hostname }}; server_name {{ matrix_nginx_proxy_base_domain_hostname }};
server_tokens off; server_tokens off;


+ 3
- 1
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-bot-go-neb.conf.j2 Vedi File

@@ -33,6 +33,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};

server_name {{ matrix_nginx_proxy_proxy_bot_go_neb_hostname }}; server_name {{ matrix_nginx_proxy_proxy_bot_go_neb_hostname }};


server_tokens off; server_tokens off;
@@ -83,7 +85,7 @@ server {
ssl_stapling_verify on; ssl_stapling_verify on;
ssl_trusted_certificate {{ matrix_ssl_config_dir_path }}/live/{{ matrix_nginx_proxy_proxy_bot_go_neb_hostname }}/chain.pem; ssl_trusted_certificate {{ matrix_ssl_config_dir_path }}/live/{{ matrix_nginx_proxy_proxy_bot_go_neb_hostname }}/chain.pem;
{% endif %} {% endif %}
{% if matrix_nginx_proxy_ssl_session_tickets_off %} {% if matrix_nginx_proxy_ssl_session_tickets_off %}
ssl_session_tickets off; ssl_session_tickets off;
{% endif %} {% endif %}


+ 2
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-client-element.conf.j2 Vedi File

@@ -41,6 +41,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};



server_name {{ matrix_nginx_proxy_proxy_element_hostname }}; server_name {{ matrix_nginx_proxy_proxy_element_hostname }};




+ 2
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-client-hydrogen.conf.j2 Vedi File

@@ -39,6 +39,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};



server_name {{ matrix_nginx_proxy_proxy_hydrogen_hostname }}; server_name {{ matrix_nginx_proxy_proxy_hydrogen_hostname }};




+ 3
- 1
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-dimension.conf.j2 Vedi File

@@ -36,6 +36,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};

server_name {{ matrix_nginx_proxy_proxy_dimension_hostname }}; server_name {{ matrix_nginx_proxy_proxy_dimension_hostname }};


server_tokens off; server_tokens off;
@@ -86,7 +88,7 @@ server {
ssl_stapling_verify on; ssl_stapling_verify on;
ssl_trusted_certificate {{ matrix_ssl_config_dir_path }}/live/{{ matrix_nginx_proxy_proxy_dimension_hostname }}/chain.pem; ssl_trusted_certificate {{ matrix_ssl_config_dir_path }}/live/{{ matrix_nginx_proxy_proxy_dimension_hostname }}/chain.pem;
{% endif %} {% endif %}
{% if matrix_nginx_proxy_ssl_session_tickets_off %} {% if matrix_nginx_proxy_ssl_session_tickets_off %}
ssl_session_tickets off; ssl_session_tickets off;
{% endif %} {% endif %}


+ 2
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 Vedi File

@@ -161,6 +161,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};

server_name {{ matrix_nginx_proxy_proxy_matrix_hostname }}; server_name {{ matrix_nginx_proxy_proxy_matrix_hostname }};


server_tokens off; server_tokens off;


+ 4
- 2
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-grafana.conf.j2 Vedi File

@@ -43,6 +43,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};



server_name {{ matrix_nginx_proxy_proxy_grafana_hostname }}; server_name {{ matrix_nginx_proxy_proxy_grafana_hostname }};


@@ -94,12 +96,12 @@ server {
ssl_stapling_verify on; ssl_stapling_verify on;
ssl_trusted_certificate {{ matrix_ssl_config_dir_path }}/live/{{ matrix_nginx_proxy_proxy_grafana_hostname }}/chain.pem; ssl_trusted_certificate {{ matrix_ssl_config_dir_path }}/live/{{ matrix_nginx_proxy_proxy_grafana_hostname }}/chain.pem;
{% endif %} {% endif %}
{% if matrix_nginx_proxy_ssl_session_tickets_off %} {% if matrix_nginx_proxy_ssl_session_tickets_off %}
ssl_session_tickets off; ssl_session_tickets off;
{% endif %} {% endif %}
ssl_session_cache {{ matrix_nginx_proxy_ssl_session_cache }}; ssl_session_cache {{ matrix_nginx_proxy_ssl_session_cache }};
ssl_session_timeout {{ matrix_nginx_proxy_ssl_session_timeout }};
ssl_session_timeout {{ matrix_nginx_proxy_ssl_session_timeout }};


{{ render_vhost_directives() }} {{ render_vhost_directives() }}
} }


+ 2
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2 Vedi File

@@ -78,6 +78,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};

server_name {{ matrix_nginx_proxy_proxy_jitsi_hostname }}; server_name {{ matrix_nginx_proxy_proxy_jitsi_hostname }};


server_tokens off; server_tokens off;


+ 2
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-riot-web.conf.j2 Vedi File

@@ -24,6 +24,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};



server_name {{ matrix_nginx_proxy_proxy_riot_compat_redirect_hostname }}; server_name {{ matrix_nginx_proxy_proxy_riot_compat_redirect_hostname }};




+ 2
- 0
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-sygnal.conf.j2 Vedi File

@@ -35,6 +35,8 @@


server { server {
listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }}; listen {{ 8080 if matrix_nginx_proxy_enabled else 80 }};
listen [::]:{{ 8080 if matrix_nginx_proxy_enabled else 80 }};

server_name {{ matrix_nginx_proxy_proxy_sygnal_hostname }}; server_name {{ matrix_nginx_proxy_proxy_sygnal_hostname }};


server_tokens off; server_tokens off;


Caricamento…
Annulla
Salva