forked from uumas/ansible-docker
Fix some ansible-lint warnings
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
---
|
||||
|
||||
requires_ansible: ">=2.10"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
- curl
|
||||
- gnupg
|
||||
- lsb-release
|
||||
update_cache: yes
|
||||
update_cache: true
|
||||
|
||||
- name: Add docker repo signing key
|
||||
apt_key:
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
---
|
||||
|
||||
reverse_proxy_type: caddy
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@ dependencies:
|
||||
- docker
|
||||
- role: uumas.general.caddy
|
||||
when: reverse_proxy_type == 'caddy'
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
---
|
||||
|
||||
element_config:
|
||||
default_server_config:
|
||||
m.homeserver:
|
||||
base_url: "{{ matrix_external_url }}"
|
||||
server_name: "{{ matrix_domain }}"
|
||||
disable_custom_urls: yes
|
||||
disable_guests: yes
|
||||
disable_custom_urls: true
|
||||
disable_guests: true
|
||||
disable_login_language_selector: false
|
||||
disable_3pid_login: true
|
||||
brand: Element
|
||||
@@ -18,17 +19,17 @@ integrations_widgets_urls:
|
||||
- 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
|
||||
"defaultCountryCode": GB
|
||||
showLabsSettings: false
|
||||
default_federate: true
|
||||
default_theme: dark
|
||||
roomDirectory:
|
||||
servers:
|
||||
- "{{ matrix_domain }}"
|
||||
enable_presence_by_hs_url:
|
||||
"https://matrix.org": no
|
||||
"https://matrix-client.matrix.org": no
|
||||
"https://matrix.org": false
|
||||
"https://matrix-client.matrix.org": false
|
||||
settingDefaults:
|
||||
breadcrumbs: yes
|
||||
breadcrumbs: true
|
||||
jitsi:
|
||||
preferredDomain: "{{ jitsi_domain | default('jitsi.riot.im') }}"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user