From 13c808139580e5d5af6c2155a33d30e8f222f891 Mon Sep 17 00:00:00 2001 From: Uumas Date: Tue, 5 Oct 2021 22:24:55 +0300 Subject: [PATCH] Fix some ansible-lint warnings --- galaxy.yml | 3 +- meta/runtime.yml | 1 - roles/docker/tasks/main.yml | 4 +- roles/element/defaults/main.yml | 1 - roles/element/meta/main.yml | 1 - roles/element/tasks/main.yml | 12 ++--- roles/element/vars/element_config.yml | 65 ++++++++++++++------------- roles/jitsi/tasks/main.yml | 10 ++--- 8 files changed, 47 insertions(+), 50 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index ae2b514..fa93344 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,7 +2,7 @@ namespace: uumas name: docker -version: 0.1.5 +version: 0.2.0 readme: README.md repository: https://git.uumas.fi/uumas/ansible-docker license_file: LICENSE @@ -10,4 +10,3 @@ dependencies: uumas.general: '>0.3.0' authors: - uumas - diff --git a/meta/runtime.yml b/meta/runtime.yml index 93977f9..63340fb 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,4 +1,3 @@ --- requires_ansible: ">=2.10" - diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 5287f0b..9ca9cc4 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -8,7 +8,7 @@ - curl - gnupg - lsb-release - update_cache: yes + update_cache: true - name: Add docker repo signing key apt_key: @@ -22,7 +22,7 @@ - name: Install docker apt: - name: + name: - docker-ce - docker-ce-cli - containerd.io diff --git a/roles/element/defaults/main.yml b/roles/element/defaults/main.yml index ea42a5f..4352d25 100644 --- a/roles/element/defaults/main.yml +++ b/roles/element/defaults/main.yml @@ -1,4 +1,3 @@ --- reverse_proxy_type: caddy - diff --git a/roles/element/meta/main.yml b/roles/element/meta/main.yml index 79d97d5..adf75a3 100644 --- a/roles/element/meta/main.yml +++ b/roles/element/meta/main.yml @@ -4,4 +4,3 @@ dependencies: - docker - role: uumas.general.caddy when: reverse_proxy_type == 'caddy' - diff --git a/roles/element/tasks/main.yml b/roles/element/tasks/main.yml index 32293d9..8fbb984 100644 --- a/roles/element/tasks/main.yml +++ b/roles/element/tasks/main.yml @@ -4,7 +4,7 @@ docker_container: name: 'element' image: 'vectorim/element-web:latest' - pull: yes + pull: true container_default_behavior: no_defaults volumes: - /app @@ -13,17 +13,17 @@ restart_policy: always register: element_out -- set_fact: +- name: Get element config volume path from container creation output + set_fact: element_config_volume: "{{ element_out.container.Mounts | selectattr('Destination', 'equalto', '/app') | join }}" - name: Read element config to variable - include_vars: - file: element_config.yml - name: element_config + include_vars: element_config.yml - name: Put element config in place copy: content: "{{ element_config }}" dest: "{{ element_config_volume.Source }}/config.json" + mode: '644' - name: Add caddy reverse proxy config blockinfile: @@ -34,6 +34,6 @@ reverse_proxy http://127.0.0.1:{{ ports.element_http }} } validate: 'caddy validate --config %s --adapter caddyfile' - backup: yes + backup: true notify: reload caddy when: reverse_proxy_type == 'caddy' diff --git a/roles/element/vars/element_config.yml b/roles/element/vars/element_config.yml index 5056bab..2391a4f 100644 --- a/roles/element/vars/element_config.yml +++ b/roles/element/vars/element_config.yml @@ -1,34 +1,35 @@ --- -default_server_config: - m.homeserver: - base_url: "{{ matrix_external_url }}" - server_name: "{{ matrix_domain }}" -disable_custom_urls: yes -disable_guests: yes -disable_login_language_selector: false -disable_3pid_login: true -brand: Element -integrations_ui_url: https://scalar.vector.im/ -integrations_rest_url: https://scalar.vector.im/api -integrations_widgets_urls: - - https://scalar.vector.im/_matrix/integrations/v1 - - https://scalar.vector.im/api - - https://scalar-staging.vector.im/_matrix/integrations/v1 - - https://scalar-staging.vector.im/api - - https://scalar-staging.riot.im/scalar/api -bug_report_endpoint_url: https://element.io/bugreports/submit -defaultCountryCode: GB -showLabsSettings: no -default_federate: yes -default_theme: dark -roomDirectory: - servers: - - "{{ matrix_domain }}" -enable_presence_by_hs_url: - "https://matrix.org": no - "https://matrix-client.matrix.org": no -settingDefaults: - breadcrumbs: yes -jitsi: - preferredDomain: "{{ jitsi_domain | default('jitsi.riot.im') }}" +element_config: + default_server_config: + m.homeserver: + base_url: "{{ matrix_external_url }}" + server_name: "{{ matrix_domain }}" + disable_custom_urls: true + disable_guests: true + disable_login_language_selector: false + disable_3pid_login: true + brand: Element + integrations_ui_url: https://scalar.vector.im/ + integrations_rest_url: https://scalar.vector.im/api + integrations_widgets_urls: + - https://scalar.vector.im/_matrix/integrations/v1 + - https://scalar.vector.im/api + - https://scalar-staging.vector.im/_matrix/integrations/v1 + - https://scalar-staging.vector.im/api + - https://scalar-staging.riot.im/scalar/api + bug_report_endpoint_url: https://element.io/bugreports/submit + "defaultCountryCode": GB + showLabsSettings: false + default_federate: true + default_theme: dark + roomDirectory: + servers: + - "{{ matrix_domain }}" + enable_presence_by_hs_url: + "https://matrix.org": false + "https://matrix-client.matrix.org": false + settingDefaults: + breadcrumbs: true + jitsi: + preferredDomain: "{{ jitsi_domain | default('jitsi.riot.im') }}" diff --git a/roles/jitsi/tasks/main.yml b/roles/jitsi/tasks/main.yml index e3569ad..7dfa75d 100644 --- a/roles/jitsi/tasks/main.yml +++ b/roles/jitsi/tasks/main.yml @@ -8,7 +8,7 @@ docker_container: name: 'jitsi_meet_web' image: 'jitsi/web:latest' - pull: yes + pull: true container_default_behavior: no_defaults published_ports: - "{{ localhost_ip }}:{{ ports.jitsi_http }}:80" @@ -35,7 +35,7 @@ docker_container: name: 'jitsi_meet_prosody' image: 'jitsi/prosody:latest' - pull: yes + pull: true container_default_behavior: no_defaults env: PUBLIC_URL: "{{ jitsi_external_url }}" @@ -63,7 +63,7 @@ docker_container: name: 'jitsi_meet_jicofo' image: 'jitsi/jicofo:latest' - pull: yes + pull: true container_default_behavior: no_defaults env: TZ: "{{ timezone }}" @@ -87,7 +87,7 @@ docker_container: name: 'jitsi_meet_jvb' image: 'jitsi/jvb:latest' - pull: yes + pull: true container_default_behavior: no_defaults published_ports: - "{{ ports.jitsi_jvb | default(10000) }}:10000/udp" @@ -120,5 +120,5 @@ reverse_proxy http://{{ localhost_ip }}:{{ ports.jitsi_http }} } validate: 'caddy validate --config %s --adapter caddyfile' - backup: yes + backup: true notify: reload caddy