Просмотр исходного кода

matrix-ntfy: add variable 'matrix_ntfy_base_url'

pull/1918/head
Julian Foad 3 лет назад
Родитель
Сommit
e119512c59
3 измененных файлов: 5 добавлений и 2 удалений
  1. +3
    -0
      roles/matrix-ntfy/defaults/main.yml
  2. +1
    -1
      roles/matrix-ntfy/tasks/self_check.yml
  3. +1
    -1
      roles/matrix-ntfy/templates/systemd/matrix-ntfy.service.j2

+ 3
- 0
roles/matrix-ntfy/defaults/main.yml Просмотреть файл

@@ -8,6 +8,9 @@ matrix_ntfy_version: v1.27.2
matrix_ntfy_docker_image: "{{ matrix_container_global_registry_prefix }}binwiederhier/ntfy:{{ matrix_ntfy_version }}" matrix_ntfy_docker_image: "{{ matrix_container_global_registry_prefix }}binwiederhier/ntfy:{{ matrix_ntfy_version }}"
matrix_ntfy_docker_image_force_pull: "{{ matrix_ntfy_docker_image.endswith(':latest') }}" matrix_ntfy_docker_image_force_pull: "{{ matrix_ntfy_docker_image.endswith(':latest') }}"


# Public facing base URL of the ntfy service
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/8080 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:8768"), or empty string to not expose.


+ 1
- 1
roles/matrix-ntfy/tasks/self_check.yml Просмотреть файл

@@ -4,7 +4,7 @@
# Expect an empty response (because we query 'since=1s'). # Expect an empty response (because we query 'since=1s').


- set_fact: - set_fact:
matrix_ntfy_url_endpoint_public: "https://{{ matrix_server_fqn_ntfy }}/upSELFCHECK123/json?poll=1&since=1s"
matrix_ntfy_url_endpoint_public: "{{ matrix_ntfy_base_url }}/upSELFCHECK123/json?poll=1&since=1s"


- name: Check ntfy - name: Check ntfy
uri: uri:


+ 1
- 1
roles/matrix-ntfy/templates/systemd/matrix-ntfy.service.j2 Просмотреть файл

@@ -25,7 +25,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-ntfy \
{% endif %} {% endif %}
--mount type=bind,src={{ matrix_ntfy_data_path }},dst=/data \ --mount type=bind,src={{ matrix_ntfy_data_path }},dst=/data \
--env NTFY_CACHE_FILE=/data/cache.db \ --env NTFY_CACHE_FILE=/data/cache.db \
--env NTFY_BASE_URL=https://{{ matrix_server_fqn_ntfy }} \
--env NTFY_BASE_URL={{ matrix_ntfy_base_url }} \
{{ matrix_ntfy_docker_image }} \ {{ matrix_ntfy_docker_image }} \
serve --behind-proxy serve --behind-proxy




Загрузка…
Отмена
Сохранить