Sfoglia il codice sorgente

matrix-ntfy: without nginx, bind to 127.0.0.1:2586

pull/1725/head^2
Julian Foad 3 anni fa
parent
commit
25b343c8c8
3 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. +2
    -0
      group_vars/matrix_servers
  2. +1
    -1
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-ntfy.conf.j2
  3. +2
    -2
      roles/matrix-ntfy/defaults/main.yml

+ 2
- 0
group_vars/matrix_servers Vedi File

@@ -1973,6 +1973,8 @@ matrix_sygnal_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enable


matrix_ntfy_enabled: false matrix_ntfy_enabled: false


matrix_ntfy_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:2586' }}"

###################################################################### ######################################################################
# #
# /matrix-ntfy # /matrix-ntfy


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

@@ -25,7 +25,7 @@
proxy_pass http://$backend; proxy_pass http://$backend;
{% else %} {% else %}
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:80;
proxy_pass http://127.0.0.1:2586;
{% endif %} {% endif %}
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";


+ 2
- 2
roles/matrix-ntfy/defaults/main.yml Vedi File

@@ -12,9 +12,9 @@ matrix_ntfy_docker_image_force_pull: "{{ matrix_ntfy_docker_image.endswith(':lat
# Public facing base URL of the ntfy service # Public facing base URL of the ntfy service
matrix_ntfy_base_url: "https://{{ matrix_server_fqn_ntfy }}" matrix_ntfy_base_url: "https://{{ matrix_server_fqn_ntfy }}"


# Controls whether the container exposes its HTTP port (tcp/8080 in the container).
# Controls whether the container exposes its HTTP port (tcp/80 in the container).
# #
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8768"), or empty string to not expose.
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:2586"), or empty string to not expose.
matrix_ntfy_container_http_host_bind_port: '' matrix_ntfy_container_http_host_bind_port: ''


# A list of extra arguments to pass to the container (`docker run` command) # A list of extra arguments to pass to the container (`docker run` command)


Caricamento…
Annulla
Salva