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

matrix-ntfy: add variable 'matrix_ntfy_base_url'

Browse Source
This commit is contained in:
Julian Foad 2022-07-04 15:27:23 +01:00
parent efe1f21f05
commit e119512c59
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/matrix-ntfy/defaults/main.yml
View File

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

2
roles/matrix-ntfy/tasks/self_check.yml
View File

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

2
roles/matrix-ntfy/templates/systemd/matrix-ntfy.service.j2
View File

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