chore(barad_dur): fix lints

This commit is contained in:
Jan Christian Grünhage 2023-07-06 22:40:17 +02:00
parent d248f5947e
commit da04b82985
No known key found for this signature in database
GPG key ID: EEC1170CE56FA2ED
8 changed files with 18 additions and 19 deletions

View file

@ -49,7 +49,7 @@ deploying commonly used matrix services:
able to run in the browser, maintained by element. able to run in the browser, maintained by element.
- [`hedwig`](roles/hedwig/README.md): Hedwig, a push-gateway server alternative - [`hedwig`](roles/hedwig/README.md): Hedwig, a push-gateway server alternative
to `sygnal`, developed by Famedly. to `sygnal`, developed by Famedly.
- [`barad-dur`](roles/barad-dur/README.md): Barad-dûr, a matrix phone-home stats collector alternative, developed by Famedly. - [`barad_dur`](roles/barad_dur/README.md): Barad-dûr, a matrix phone-home stats collector alternative, developed by Famedly.
### Unmaintained roles ### Unmaintained roles

View file

@ -1,7 +0,0 @@
---
- name: restart-barad-dur
docker_container:
name: "{{ barad_dur_container_name }}"
state: started
restart: yes

View file

@ -8,7 +8,7 @@ barad_dur_container_image_registry: "registry.gitlab.com"
barad_dur_container_image_namespace: "famedly/company/backend/services/" barad_dur_container_image_namespace: "famedly/company/backend/services/"
barad_dur_container_image_name: "barad-dur" barad_dur_container_image_name: "barad-dur"
barad_dur_version: "0.1.2" barad_dur_version: "0.1.2"
#barad_dur_container_image_tag: ~ # barad_dur_container_image_tag: ~
barad_dur_container_force_pull: "{{ barad_dur_container_image_tag is defined }}" barad_dur_container_force_pull: "{{ barad_dur_container_image_tag is defined }}"
barad_dur_container_image_reference: >- barad_dur_container_image_reference: >-

View file

@ -0,0 +1,8 @@
---
- name: Restart barad-dur container
community.docker.docker_container:
name: "{{ barad_dur_container_name }}"
state: started
restart: true
listen: restart-barad-dur

View file

@ -6,8 +6,7 @@
state: present state: present
system: true system: true
register: barad_dur_user_res register: barad_dur_user_res
tags: [ 'prepare', 'prepare-barad_dur', tags: ['prepare', 'prepare-barad_dur', 'deploy', 'deploy-barad_dur']
'deploy', 'deploy-barad_dur' ]
- name: Create base-directory for barad-dur [{{ barad_dur_base_path }}] - name: Create base-directory for barad-dur [{{ barad_dur_base_path }}]
file: file:
@ -16,7 +15,7 @@
owner: "{{ barad_dur_user_res.uid }}" owner: "{{ barad_dur_user_res.uid }}"
group: "{{ barad_dur_user_res.group }}" group: "{{ barad_dur_user_res.group }}"
mode: "0755" mode: "0755"
tags: [ 'prepare', 'prepare-barad_dur' ] tags: ['prepare', 'prepare-barad_dur']
- name: Template configuration file for barad-dur [{{ barad_dur_config_file }}] - name: Template configuration file for barad-dur [{{ barad_dur_config_file }}]
template: template:
@ -26,10 +25,10 @@
group: "{{ barad_dur_user_res.group }}" group: "{{ barad_dur_user_res.group }}"
mode: "0640" mode: "0640"
notify: restart-barad-dur notify: restart-barad-dur
tags: [ 'deploy', 'deploy-barad_dur' ] tags: ['deploy', 'deploy-barad_dur']
- name: Pull barad-dur container - name: Pull barad-dur container
docker_image: community.docker.docker_image:
name: "{{ barad_dur_container_image_reference }}" name: "{{ barad_dur_container_image_reference }}"
source: pull source: pull
state: present state: present
@ -38,10 +37,10 @@
until: barad_dur_container_image_pulled is success until: barad_dur_container_image_pulled is success
retries: 10 retries: 10
delay: 5 delay: 5
tags: [ 'prepare', 'prepare-barad_dur' ] tags: ['prepare', 'prepare-barad_dur']
- name: Start barad-dur container - name: Start barad-dur container
docker_container: community.docker.docker_container:
name: "{{ barad_dur_container_name }}" name: "{{ barad_dur_container_name }}"
image: "{{ barad_dur_container_image_reference }}" image: "{{ barad_dur_container_image_reference }}"
env: "{{ barad_dur_container_env }}" env: "{{ barad_dur_container_env }}"
@ -51,4 +50,4 @@
volumes: "{{ barad_dur_container_volumes }}" volumes: "{{ barad_dur_container_volumes }}"
restart_policy: "{{ barad_dur_container_restart_policy }}" restart_policy: "{{ barad_dur_container_restart_policy }}"
state: "{{ barad_dur_container_state }}" state: "{{ barad_dur_container_state }}"
tags: [ 'deploy', 'deploy-barad_dur' ] tags: ['deploy', 'deploy-barad_dur']

View file

@ -1,10 +1,9 @@
--- ---
barad_dur_container_base_volumes: barad_dur_container_base_volumes:
- "{{ barad_dur_config_file }}:{{ barad_dur_container_base_path }}/config.yaml:ro" - "{{ barad_dur_config_file }}:{{ barad_dur_container_base_path }}/config.yaml:ro"
barad_dur_container_volumes: "{{ barad_dur_container_base_volumes + barad_dur_container_extra_volumes }}" barad_dur_container_volumes: "{{ barad_dur_container_base_volumes + barad_dur_container_extra_volumes }}"
barad_dur_container_base_labels: barad_dur_container_base_labels:
version: "{{ barad_dur_container_image_tag|default(barad_dur_version) }}" version: "{{ barad_dur_container_image_tag | default(barad_dur_version) }}"
barad_dur_container_labels_complete: "{{ barad_dur_container_base_labels | combine(barad_dur_container_labels) }}" barad_dur_container_labels_complete: "{{ barad_dur_container_base_labels | combine(barad_dur_container_labels) }}"