Add matrix_hookshot_container_network

This commit is contained in:
Slavi Pantaleev 2023-03-20 17:03:19 +02:00
parent 1b6a85e485
commit ade312e6f6
3 changed files with 9 additions and 2 deletions

View File

@ -200,6 +200,8 @@ matrix_hookshot_permissions: []
matrix_hookshot_bot_displayname: Hookshot Bot matrix_hookshot_bot_displayname: Hookshot Bot
matrix_hookshot_bot_avatar: 'mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d' matrix_hookshot_bot_avatar: 'mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d'
matrix_hookshot_container_network: "{{ matrix_docker_network }}"
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container
matrix_hookshot_container_extra_arguments: [] matrix_hookshot_container_extra_arguments: []

View File

@ -107,6 +107,11 @@
group: "{{ matrix_user_groupname }}" group: "{{ matrix_user_groupname }}"
when: matrix_hookshot_github_enabled | bool and matrix_hookshot_github_private_key|length > 0 when: matrix_hookshot_github_enabled | bool and matrix_hookshot_github_private_key|length > 0
- name: Ensure matrix-hookshot container network is created
community.general.docker_network:
name: "{{ matrix_hookshot_container_network }}"
driver: bridge
- name: Ensure matrix-hookshot.service installed - name: Ensure matrix-hookshot.service installed
ansible.builtin.template: ansible.builtin.template:
src: "{{ role_path }}/templates/systemd/matrix-hookshot.service.j2" src: "{{ role_path }}/templates/systemd/matrix-hookshot.service.j2"

View File

@ -20,8 +20,8 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
--log-driver=none \ --log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \ --cap-drop=ALL \
--network={{ matrix_docker_network }} \ --network={{ matrix_hookshot_container_network }} \
-v {{ matrix_hookshot_base_path }}:/data:z \ --mount type=bind,src={{ matrix_hookshot_base_path }},dst=/data \
{% for port in matrix_hookshot_container_http_host_bind_ports %} {% for port in matrix_hookshot_container_http_host_bind_ports %}
-p {{ port }} \ -p {{ port }} \
{% endfor %} {% endfor %}