Fix some ansible-lint warnings

This commit is contained in:
Uumas
2021-10-05 22:24:55 +03:00
parent 7e76a7f79a
commit 13c8081395
8 changed files with 47 additions and 50 deletions

View File

@@ -2,7 +2,7 @@
namespace: uumas namespace: uumas
name: docker name: docker
version: 0.1.5 version: 0.2.0
readme: README.md readme: README.md
repository: https://git.uumas.fi/uumas/ansible-docker repository: https://git.uumas.fi/uumas/ansible-docker
license_file: LICENSE license_file: LICENSE
@@ -10,4 +10,3 @@ dependencies:
uumas.general: '>0.3.0' uumas.general: '>0.3.0'
authors: authors:
- uumas - uumas

View File

@@ -1,4 +1,3 @@
--- ---
requires_ansible: ">=2.10" requires_ansible: ">=2.10"

View File

@@ -8,7 +8,7 @@
- curl - curl
- gnupg - gnupg
- lsb-release - lsb-release
update_cache: yes update_cache: true
- name: Add docker repo signing key - name: Add docker repo signing key
apt_key: apt_key:
@@ -22,7 +22,7 @@
- name: Install docker - name: Install docker
apt: apt:
name: name:
- docker-ce - docker-ce
- docker-ce-cli - docker-ce-cli
- containerd.io - containerd.io

View File

@@ -1,4 +1,3 @@
--- ---
reverse_proxy_type: caddy reverse_proxy_type: caddy

View File

@@ -4,4 +4,3 @@ dependencies:
- docker - docker
- role: uumas.general.caddy - role: uumas.general.caddy
when: reverse_proxy_type == 'caddy' when: reverse_proxy_type == 'caddy'

View File

@@ -4,7 +4,7 @@
docker_container: docker_container:
name: 'element' name: 'element'
image: 'vectorim/element-web:latest' image: 'vectorim/element-web:latest'
pull: yes pull: true
container_default_behavior: no_defaults container_default_behavior: no_defaults
volumes: volumes:
- /app - /app
@@ -13,17 +13,17 @@
restart_policy: always restart_policy: always
register: element_out 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 }}" element_config_volume: "{{ element_out.container.Mounts | selectattr('Destination', 'equalto', '/app') | join }}"
- name: Read element config to variable - name: Read element config to variable
include_vars: include_vars: element_config.yml
file: element_config.yml
name: element_config
- name: Put element config in place - name: Put element config in place
copy: copy:
content: "{{ element_config }}" content: "{{ element_config }}"
dest: "{{ element_config_volume.Source }}/config.json" dest: "{{ element_config_volume.Source }}/config.json"
mode: '644'
- name: Add caddy reverse proxy config - name: Add caddy reverse proxy config
blockinfile: blockinfile:
@@ -34,6 +34,6 @@
reverse_proxy http://127.0.0.1:{{ ports.element_http }} reverse_proxy http://127.0.0.1:{{ ports.element_http }}
} }
validate: 'caddy validate --config %s --adapter caddyfile' validate: 'caddy validate --config %s --adapter caddyfile'
backup: yes backup: true
notify: reload caddy notify: reload caddy
when: reverse_proxy_type == 'caddy' when: reverse_proxy_type == 'caddy'

View File

@@ -1,34 +1,35 @@
--- ---
default_server_config: element_config:
m.homeserver: default_server_config:
base_url: "{{ matrix_external_url }}" m.homeserver:
server_name: "{{ matrix_domain }}" base_url: "{{ matrix_external_url }}"
disable_custom_urls: yes server_name: "{{ matrix_domain }}"
disable_guests: yes disable_custom_urls: true
disable_login_language_selector: false disable_guests: true
disable_3pid_login: true disable_login_language_selector: false
brand: Element disable_3pid_login: true
integrations_ui_url: https://scalar.vector.im/ brand: Element
integrations_rest_url: https://scalar.vector.im/api integrations_ui_url: https://scalar.vector.im/
integrations_widgets_urls: integrations_rest_url: https://scalar.vector.im/api
- https://scalar.vector.im/_matrix/integrations/v1 integrations_widgets_urls:
- https://scalar.vector.im/api - https://scalar.vector.im/_matrix/integrations/v1
- https://scalar-staging.vector.im/_matrix/integrations/v1 - https://scalar.vector.im/api
- https://scalar-staging.vector.im/api - https://scalar-staging.vector.im/_matrix/integrations/v1
- https://scalar-staging.riot.im/scalar/api - https://scalar-staging.vector.im/api
bug_report_endpoint_url: https://element.io/bugreports/submit - https://scalar-staging.riot.im/scalar/api
defaultCountryCode: GB bug_report_endpoint_url: https://element.io/bugreports/submit
showLabsSettings: no "defaultCountryCode": GB
default_federate: yes showLabsSettings: false
default_theme: dark default_federate: true
roomDirectory: default_theme: dark
servers: roomDirectory:
- "{{ matrix_domain }}" servers:
enable_presence_by_hs_url: - "{{ matrix_domain }}"
"https://matrix.org": no enable_presence_by_hs_url:
"https://matrix-client.matrix.org": no "https://matrix.org": false
settingDefaults: "https://matrix-client.matrix.org": false
breadcrumbs: yes settingDefaults:
jitsi: breadcrumbs: true
preferredDomain: "{{ jitsi_domain | default('jitsi.riot.im') }}" jitsi:
preferredDomain: "{{ jitsi_domain | default('jitsi.riot.im') }}"

View File

@@ -8,7 +8,7 @@
docker_container: docker_container:
name: 'jitsi_meet_web' name: 'jitsi_meet_web'
image: 'jitsi/web:latest' image: 'jitsi/web:latest'
pull: yes pull: true
container_default_behavior: no_defaults container_default_behavior: no_defaults
published_ports: published_ports:
- "{{ localhost_ip }}:{{ ports.jitsi_http }}:80" - "{{ localhost_ip }}:{{ ports.jitsi_http }}:80"
@@ -35,7 +35,7 @@
docker_container: docker_container:
name: 'jitsi_meet_prosody' name: 'jitsi_meet_prosody'
image: 'jitsi/prosody:latest' image: 'jitsi/prosody:latest'
pull: yes pull: true
container_default_behavior: no_defaults container_default_behavior: no_defaults
env: env:
PUBLIC_URL: "{{ jitsi_external_url }}" PUBLIC_URL: "{{ jitsi_external_url }}"
@@ -63,7 +63,7 @@
docker_container: docker_container:
name: 'jitsi_meet_jicofo' name: 'jitsi_meet_jicofo'
image: 'jitsi/jicofo:latest' image: 'jitsi/jicofo:latest'
pull: yes pull: true
container_default_behavior: no_defaults container_default_behavior: no_defaults
env: env:
TZ: "{{ timezone }}" TZ: "{{ timezone }}"
@@ -87,7 +87,7 @@
docker_container: docker_container:
name: 'jitsi_meet_jvb' name: 'jitsi_meet_jvb'
image: 'jitsi/jvb:latest' image: 'jitsi/jvb:latest'
pull: yes pull: true
container_default_behavior: no_defaults container_default_behavior: no_defaults
published_ports: published_ports:
- "{{ ports.jitsi_jvb | default(10000) }}:10000/udp" - "{{ ports.jitsi_jvb | default(10000) }}:10000/udp"
@@ -120,5 +120,5 @@
reverse_proxy http://{{ localhost_ip }}:{{ ports.jitsi_http }} reverse_proxy http://{{ localhost_ip }}:{{ ports.jitsi_http }}
} }
validate: 'caddy validate --config %s --adapter caddyfile' validate: 'caddy validate --config %s --adapter caddyfile'
backup: yes backup: true
notify: reload caddy notify: reload caddy