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

Rename variable for consistency (matrix_hookshot_ident -> matrix_hookshot_identifier)

Browse Source
This commit is contained in:
Slavi Pantaleev 2024-01-09 09:56:21 +02:00
parent fce84a2b3c
commit 4c7ee34194
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/custom/matrix-bridge-hookshot/defaults/main.yml
View File

@ -5,7 +5,7 @@
matrix_hookshot_enabled: true matrix_hookshot_enabled: true
matrix_hookshot_ident: matrix-hookshot matrix_hookshot_identifier: matrix-hookshot
matrix_hookshot_container_image_self_build: false matrix_hookshot_container_image_self_build: false
matrix_hookshot_container_image_self_build_repo: "https://github.com/matrix-org/matrix-hookshot.git" matrix_hookshot_container_image_self_build_repo: "https://github.com/matrix-org/matrix-hookshot.git"

2
roles/custom/matrix-bridge-hookshot/tasks/reset_encryption.yml
View File

@ -5,7 +5,7 @@
cmd: | cmd: |
{{ devture_systemd_docker_base_host_command_docker }} run {{ devture_systemd_docker_base_host_command_docker }} run
--rm --rm
--name={{ matrix_hookshot_ident }}-reset-crypto --name={{ matrix_hookshot_identifier }}-reset-crypto
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} --user={{ matrix_user_uid }}:{{ matrix_user_gid }}
--cap-drop=ALL --cap-drop=ALL
--mount type=bind,src={{ matrix_hookshot_base_path }}/config.yml,dst=/config.yml --mount type=bind,src={{ matrix_hookshot_base_path }}/config.yml,dst=/config.yml

1
roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml
View File

@ -28,6 +28,7 @@
- {'old': 'matrix_hookshot_jira_oauth_secret', 'new': 'matrix_hookshot_jira_oauth_client_secret'} - {'old': 'matrix_hookshot_jira_oauth_secret', 'new': 'matrix_hookshot_jira_oauth_client_secret'}
- {'old': 'matrix_hookshot_jira_oauth_uri', 'new': 'matrix_hookshot_jira_oauth_client_secret'} - {'old': 'matrix_hookshot_jira_oauth_uri', 'new': 'matrix_hookshot_jira_oauth_client_secret'}
- {'old': 'matrix_hookshot_gitlab_secret', 'new': 'matrix_hookshot_gitlab_webhook_secret'} - {'old': 'matrix_hookshot_gitlab_secret', 'new': 'matrix_hookshot_gitlab_webhook_secret'}
- {'old': 'matrix_hookshot_ident', 'new': 'matrix_hookshot_identifier'}
- name: Fail if required settings not defined - name: Fail if required settings not defined
ansible.builtin.fail: ansible.builtin.fail:

16
roles/custom/matrix-bridge-hookshot/templates/systemd/matrix-hookshot.service.j2
View File

@ -13,9 +13,9 @@ DefaultDependencies=no
[Service] [Service]
Type=simple Type=simple
Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}" Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} {{ matrix_hookshot_ident }} ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} {{ matrix_hookshot_identifier }}
ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_ident }} ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_identifier }}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm --name {{ matrix_hookshot_ident }} \ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm --name {{ matrix_hookshot_identifier }} \
--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 \
@ -31,17 +31,17 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create --rm -
{{ matrix_hookshot_docker_image }} {{ matrix_hookshot_docker_image }}
{% for network in matrix_hookshot_container_additional_networks %} {% for network in matrix_hookshot_container_additional_networks %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_hookshot_ident }} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_hookshot_identifier }}
{% endfor %} {% endfor %}
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach {{ matrix_hookshot_ident }} ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach {{ matrix_hookshot_identifier }}
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} {{ matrix_hookshot_ident }} ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} {{ matrix_hookshot_identifier }}
ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_ident }} ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} rm {{ matrix_hookshot_identifier }}
Restart=always Restart=always
RestartSec=30 RestartSec=30
SyslogIdentifier={{ matrix_hookshot_ident }} SyslogIdentifier={{ matrix_hookshot_identifier }}
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target