Compare commits
6 Commits
11e22ed34a
...
3ce5f94e87
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ce5f94e87 | ||
|
|
2d34f7a163 | ||
|
|
d6518d404e | ||
|
|
bb9026bb6a | ||
|
|
e980ee0bfc | ||
|
|
43f10d744a |
@@ -3,7 +3,7 @@ namespace: uumas
|
|||||||
name: podman
|
name: podman
|
||||||
description: Roles for installing services in podman containers
|
description: Roles for installing services in podman containers
|
||||||
readme: README.md
|
readme: README.md
|
||||||
version: 0.1.1
|
version: 0.1.3
|
||||||
repository: "https://git.uumas.fi/uumas/ansible-podman"
|
repository: "https://git.uumas.fi/uumas/ansible-podman"
|
||||||
license_file: LICENSE
|
license_file: LICENSE
|
||||||
authors:
|
authors:
|
||||||
|
|||||||
1
roles/mautrix_whatsapp/README.md
Normal file
1
roles/mautrix_whatsapp/README.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Sets up a mautrix-whatsapp bridge
|
||||||
5
roles/mautrix_whatsapp/defaults/main.yaml
Normal file
5
roles/mautrix_whatsapp/defaults/main.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
mautrix_whatsapp_os_name: Matrix bridge
|
||||||
|
mautrix_whatsapp_bot_displayname: WhatsApp bridge
|
||||||
|
mautrix_whatsapp_default_relays: []
|
||||||
|
mautrix_whatsapp_permissions: {}
|
||||||
57
roles/mautrix_whatsapp/meta/argument_specs.yaml
Normal file
57
roles/mautrix_whatsapp/meta/argument_specs.yaml
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
---
|
||||||
|
argument_specs:
|
||||||
|
main:
|
||||||
|
description:
|
||||||
|
- Sets up a mautrix-whatsapp bridge
|
||||||
|
options:
|
||||||
|
mautrix_whatsapp_homeserver_name:
|
||||||
|
description: Matrix server name of homeserver the bridge is connected to.
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
mautrix_whatsapp_as_token:
|
||||||
|
description: A secret token that the application service will use to authenticate requests to the homeserver
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
mautrix_whatsapp_hs_token:
|
||||||
|
description: A secret token that the homeserver will use authenticate requests to the application service
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
mautrix_whatsapp_doublepuppet_token:
|
||||||
|
description: Double puppeting as token to impersonate matrix users
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
mautrix_whatsapp_os_name:
|
||||||
|
description: Device name that's shown in the "WhatsApp Web" section in the mobile app
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: Matrix bridge
|
||||||
|
mautrix_whatsapp_bot_displayname:
|
||||||
|
description: Display name for the bridge bot
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: WhatsApp bridge
|
||||||
|
mautrix_whatsapp_default_relays:
|
||||||
|
description: List of user login IDs which anyone can set as a relay, as long as the relay user is in the room
|
||||||
|
type: list
|
||||||
|
required: false
|
||||||
|
default: []
|
||||||
|
elements: str
|
||||||
|
mautrix_whatsapp_permissions:
|
||||||
|
description: Permissions for using the bridge. All users are given the relay permission regardless of this.
|
||||||
|
type: list
|
||||||
|
required: false
|
||||||
|
default: []
|
||||||
|
elements: dict
|
||||||
|
options:
|
||||||
|
key:
|
||||||
|
description: Domain or user id to apply permission value to
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
value:
|
||||||
|
description: Permission value to apply
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
choices:
|
||||||
|
- commands
|
||||||
|
- user
|
||||||
|
- admin
|
||||||
32
roles/mautrix_whatsapp/tasks/main.yaml
Normal file
32
roles/mautrix_whatsapp/tasks/main.yaml
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
---
|
||||||
|
- name: Mautrix-WhatsApp container
|
||||||
|
ansible.builtin.import_role:
|
||||||
|
name: service
|
||||||
|
vars:
|
||||||
|
service_name: mautrix-whatsapp
|
||||||
|
service_container_image: "{{ _mautrix_whatsapp_image }}"
|
||||||
|
service_container_user: 1337:1337
|
||||||
|
service_container_command:
|
||||||
|
- /usr/bin/mautrix-whatsapp
|
||||||
|
- --no-update
|
||||||
|
service_database_type: postgres
|
||||||
|
service_container_additional_networks:
|
||||||
|
- synapse-mautrix-whatsapp
|
||||||
|
service_container_mounts:
|
||||||
|
- type: template
|
||||||
|
source: config.yaml.j2
|
||||||
|
destination: /data/config.yaml
|
||||||
|
service_container_secrets:
|
||||||
|
- name: as-token
|
||||||
|
value: "{{ mautrix_whatsapp_as_token }}"
|
||||||
|
- name: hs-token
|
||||||
|
value: "{{ mautrix_whatsapp_hs_token }}"
|
||||||
|
- name: doublepuppet-token
|
||||||
|
value: as_token:{{ mautrix_whatsapp_doublepuppet_token }}
|
||||||
|
- name: encryption-pickle-key
|
||||||
|
service_container_env:
|
||||||
|
BRIDGE_DATABASE__URI_FILE: /run/secrets/postgres-url
|
||||||
|
BRIDGE_APPSERVICE__AS_TOKEN_FILE: /run/secrets/as-token
|
||||||
|
BRIDGE_APPSERVICE__HS_TOKEN_FILE: /run/secrets/hs-token
|
||||||
|
BRIDGE_ENCRYPTION__PICKLE_KEY: /run/secrets/encryption-pickle-key
|
||||||
|
"BRIDGE_DOUBLE_PUPPET__SECRETS__{{ mautrix_whatsapp_homeserver_name }}": /run/secrets/doublepuppet-token
|
||||||
73
roles/mautrix_whatsapp/templates/config.yaml.j2
Normal file
73
roles/mautrix_whatsapp/templates/config.yaml.j2
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
---
|
||||||
|
# vim:ft=yaml
|
||||||
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
|
network:
|
||||||
|
os_name: "{{ mautrix_whatsapp_os_name }}"
|
||||||
|
|
||||||
|
send_presence_on_typing: true
|
||||||
|
url_previews: true
|
||||||
|
extev_polls: true
|
||||||
|
|
||||||
|
bridge:
|
||||||
|
cleanup_on_logout:
|
||||||
|
enabled: true
|
||||||
|
manual:
|
||||||
|
private: nothing
|
||||||
|
relayed: nothing
|
||||||
|
shared_no_users: kick
|
||||||
|
shared_has_users: kick
|
||||||
|
bad_credentials:
|
||||||
|
private: nothing
|
||||||
|
relayed: nothing
|
||||||
|
shared_no_users: kick
|
||||||
|
shared_has_users: kick
|
||||||
|
|
||||||
|
relay:
|
||||||
|
enabled: true
|
||||||
|
admin_only: true
|
||||||
|
default_relays:
|
||||||
|
{{ mautrix_whatsapp_default_relays | to_nice_yaml | indent(4) }}
|
||||||
|
permissions:
|
||||||
|
"*": relay
|
||||||
|
{% for item in mautrix_whatsapp_permissions %}
|
||||||
|
"{{ item.key }}": {{ item.value }}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
database:
|
||||||
|
type: postgres
|
||||||
|
|
||||||
|
homeserver:
|
||||||
|
address: http://synapse:8009
|
||||||
|
domain: {{ mautrix_whatsapp_homeserver_name }}
|
||||||
|
async_media: true
|
||||||
|
|
||||||
|
appservice:
|
||||||
|
address: http://mautrix-whatsapp:8080
|
||||||
|
hostname: 0.0.0.0
|
||||||
|
port: 8080
|
||||||
|
id: whatsapp
|
||||||
|
bot:
|
||||||
|
username: whatsappbot
|
||||||
|
displayname: {{ mautrix_whatsapp_bot_displayname }}
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
delivery_receipts: true
|
||||||
|
|
||||||
|
provisioning:
|
||||||
|
shared_secret: disable
|
||||||
|
|
||||||
|
encryption:
|
||||||
|
allow: true
|
||||||
|
default: false
|
||||||
|
msc4190: true
|
||||||
|
|
||||||
|
allow_key_sharing: true
|
||||||
|
|
||||||
|
env_config_prefix: BRIDGE_
|
||||||
|
|
||||||
|
logging:
|
||||||
|
min_level: info
|
||||||
|
writers:
|
||||||
|
- type: stdout
|
||||||
|
format: pretty-colored
|
||||||
2
roles/mautrix_whatsapp/vars/main.yaml
Normal file
2
roles/mautrix_whatsapp/vars/main.yaml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
---
|
||||||
|
_mautrix_whatsapp_image: dock.mau.dev/mautrix/whatsapp:latest
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
- name: Unregister AppAPI daemon
|
- name: Unregister AppAPI daemon
|
||||||
containers.podman.podman_container_exec:
|
containers.podman.podman_container_exec:
|
||||||
name: nextcloud
|
name: nextcloud
|
||||||
|
user: www-data
|
||||||
argv:
|
argv:
|
||||||
- /var/www/html/occ
|
- /var/www/html/occ
|
||||||
- app_api:daemon:unregister
|
- app_api:daemon:unregister
|
||||||
@@ -14,6 +15,7 @@
|
|||||||
- name: Register AppAPI daemon
|
- name: Register AppAPI daemon
|
||||||
containers.podman.podman_container_exec:
|
containers.podman.podman_container_exec:
|
||||||
name: nextcloud
|
name: nextcloud
|
||||||
|
user: www-data
|
||||||
argv:
|
argv:
|
||||||
- /bin/sh
|
- /bin/sh
|
||||||
- -c
|
- -c
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ argument_specs:
|
|||||||
- Mount source.
|
- Mount source.
|
||||||
- If mount type is volume, name of the volume.
|
- If mount type is volume, name of the volume.
|
||||||
- If mount type is bind, host path to bind mount inside the container.
|
- If mount type is bind, host path to bind mount inside the container.
|
||||||
- If mount type is template, the name of the template file, must end in .j2
|
- If mount type is template, the name of the template file, must end in .j2.
|
||||||
- If mount type is copy, name of the file or directory to copy. Directory name must end in /.
|
- If mount type is copy, name of the file or directory to copy. Directory name must end in /.
|
||||||
type: str
|
type: str
|
||||||
required: true
|
required: true
|
||||||
@@ -220,9 +220,18 @@ argument_specs:
|
|||||||
Command used to verify templated file validity.
|
Command used to verify templated file validity.
|
||||||
Will be run in a temporary container using the same container image as the main service.
|
Will be run in a temporary container using the same container image as the main service.
|
||||||
File will be available in the same place as in the service container (destination).
|
File will be available in the same place as in the service container (destination).
|
||||||
Only applicable if mount type is template
|
Only applicable if mount type is template.
|
||||||
type: str
|
type: str
|
||||||
required: false
|
required: false
|
||||||
|
template_directory:
|
||||||
|
description: >-
|
||||||
|
Whether to create a directory and mount it at the destination file's parent directory.
|
||||||
|
This is required for container to see templated file changes without restart.
|
||||||
|
Only applicable if mount type is template.
|
||||||
|
type: bool
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
|
||||||
service_container_devices:
|
service_container_devices:
|
||||||
description: List of devices to be added inside the service main container.
|
description: List of devices to be added inside the service main container.
|
||||||
type: list
|
type: list
|
||||||
@@ -326,6 +335,7 @@ argument_specs:
|
|||||||
host <service database type> on the default port.
|
host <service database type> on the default port.
|
||||||
- The database user will be <service name>
|
- The database user will be <service name>
|
||||||
- The password will be accessible as secret at /run/secrets/<service database type>
|
- The password will be accessible as secret at /run/secrets/<service database type>
|
||||||
|
- A postgres url is accessible as secret at /run/secrets/postgres-url
|
||||||
- >
|
- >
|
||||||
The password will also be available as the
|
The password will also be available as the
|
||||||
service_podman_secrets['<service name>-<service database type>'] variable.
|
service_podman_secrets['<service name>-<service database type>'] variable.
|
||||||
|
|||||||
@@ -13,28 +13,29 @@
|
|||||||
|
|
||||||
- name: Create service template mount directories
|
- name: Create service template mount directories
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ _service_host_directory }}/mounts/{{ item }}"
|
path: "{{ item }}"
|
||||||
state: directory
|
state: directory
|
||||||
mode: "0700"
|
mode: "0700"
|
||||||
loop: "{{ _service_all_template_mount_directories }}"
|
loop: "{{ _service_all_template_mount_host_files | map('dirname') | unique }}"
|
||||||
|
|
||||||
- name: Template files for template mounts
|
- name: Template files for template mounts
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ item[0].source }}"
|
src: "{{ item.source }}"
|
||||||
dest: "{{ item[1] }}"
|
dest: "{{ item.hostfile }}"
|
||||||
mode: "{{ item[0].mode | default('0644') }}"
|
mode: "{{ item.mode | default('0644') }}"
|
||||||
validate: "{{ validate if item[0].template_validate_command is defined else omit }}"
|
validate: "{{ validate if item.template_validate_command is defined else omit }}"
|
||||||
notify: >-
|
notify: >-
|
||||||
{{ 'Reload' if service_container_reload_method != 'none' else 'Restart' }}
|
{{ 'Reload' if service_container_reload_method != 'none' else 'Restart' }}
|
||||||
container service {{ service_name }}
|
container service {{ service_name }}
|
||||||
loop: "{{ _service_all_template_mounts | zip(_service_all_template_mount_host_files) }}"
|
loop: "{{ _service_all_template_mounts_full }}"
|
||||||
vars:
|
vars:
|
||||||
validate: >-
|
validate: "{{ _service_template_validate_command }}"
|
||||||
podman run --rm
|
|
||||||
-v %s:{{ item[0].destination }}:ro
|
- name: Ensure no legacy templated files present
|
||||||
--entrypoint {{ item[0].template_validate_command.split(' ', 1)[0] }}
|
ansible.builtin.file:
|
||||||
{{ service_container_image }}
|
path: "{{ _service_host_directory }}/mounts/{{ item.source | regex_replace('\\.j2$', '') }}"
|
||||||
{{ item[0].template_validate_command.split(' ', 1)[1] }}
|
state: absent
|
||||||
|
loop: "{{ _service_all_template_mounts_full }}"
|
||||||
|
|
||||||
- name: Copy files for copy mounts
|
- name: Copy files for copy mounts
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
|
|||||||
@@ -25,21 +25,60 @@ _service_container_bind_mounts: >-
|
|||||||
service_container_mounts | selectattr('type', '==', 'bind') +
|
service_container_mounts | selectattr('type', '==', 'bind') +
|
||||||
([ _service_container_socket_mount ] if _service_native_socket else [])
|
([ _service_container_socket_mount ] if _service_native_socket else [])
|
||||||
}}
|
}}
|
||||||
_service_container_template_mounts: >-
|
|
||||||
|
_service_template_mounts_hostfiles: >-
|
||||||
{{
|
{{
|
||||||
([{'readonly': true}] * _service_template_mounts | length) |
|
_service_template_mounts
|
||||||
zip(
|
| map(attribute='destination')
|
||||||
_service_template_mounts |
|
| map('dirname')
|
||||||
community.general.remove_keys(['mode', 'template_validate_command']),
|
| map('replace', '/', '_')
|
||||||
_service_template_mounts |
|
| map('regex_replace', '^', _service_host_directory ~ '/mounts/')
|
||||||
map(attribute='source') |
|
| zip(
|
||||||
map('regex_replace', '\.j2$', '') |
|
_service_template_mounts
|
||||||
map('regex_replace', '^', _service_host_directory ~ '/mounts/') |
|
| map(attribute='destination')
|
||||||
map('community.general.dict_kv', 'source'),
|
| map('basename')
|
||||||
([{'type': 'bind'}] * _service_template_mounts | length)
|
)
|
||||||
|
| map('path_join')
|
||||||
|
| map('community.general.dict_kv', 'hostfile')
|
||||||
|
}}
|
||||||
|
_service_template_mounts_full: >-
|
||||||
|
{{
|
||||||
|
([{'readonly': true, 'template_directory': false}] * _service_template_mounts | length)
|
||||||
|
| zip(
|
||||||
|
_service_template_mounts,
|
||||||
|
_service_template_mounts_hostfiles
|
||||||
|
)
|
||||||
|
| map('combine')
|
||||||
|
}}
|
||||||
|
_service_template_mounts_plain: "{{ _service_template_mounts_full | rejectattr('template_directory') }}"
|
||||||
|
_service_container_template_mounts_plain: >-
|
||||||
|
{{
|
||||||
|
_service_template_mounts_plain
|
||||||
|
| community.general.remove_keys(['mode', 'template_validate_command', 'template_directory', 'hostfile'])
|
||||||
|
| zip(
|
||||||
|
_service_template_mounts_plain
|
||||||
|
| map(attribute='hostfile')
|
||||||
|
| map('community.general.dict_kv', 'source'),
|
||||||
|
([{'type': 'bind'}] * _service_template_mounts_plain | length)
|
||||||
) |
|
) |
|
||||||
map('combine')
|
map('combine')
|
||||||
}}
|
}}
|
||||||
|
_service_template_mounts_directory: "{{ _service_template_mounts_full | selectattr('template_directory') }}"
|
||||||
|
_service_container_template_mounts_directory: >-
|
||||||
|
{{
|
||||||
|
_service_template_mounts_directory
|
||||||
|
| community.general.remove_keys(['mode', 'template_validate_command', 'template_directory', 'hostfile'])
|
||||||
|
| zip(
|
||||||
|
_service_template_mounts_directory
|
||||||
|
| map(attribute='hostfile')
|
||||||
|
| map('dirname')
|
||||||
|
| map('community.general.dict_kv', 'source'),
|
||||||
|
([{'type': 'bind'}] * _service_template_mounts_directory | length)
|
||||||
|
)
|
||||||
|
| map('combine')
|
||||||
|
| unique
|
||||||
|
}}
|
||||||
|
|
||||||
_service_container_copy_mounts: >-
|
_service_container_copy_mounts: >-
|
||||||
{{
|
{{
|
||||||
([{'readonly': true}] * _service_copy_mounts | length) |
|
([{'readonly': true}] * _service_copy_mounts | length) |
|
||||||
@@ -58,40 +97,49 @@ _service_container_copy_mounts: >-
|
|||||||
|
|
||||||
_service_container_mounts: >-
|
_service_container_mounts: >-
|
||||||
{{
|
{{
|
||||||
_service_container_volume_mounts +
|
_service_container_volume_mounts
|
||||||
_service_container_bind_mounts +
|
+ _service_container_bind_mounts
|
||||||
_service_container_template_mounts +
|
+ _service_container_template_mounts_plain
|
||||||
_service_container_copy_mounts
|
+ _service_container_template_mounts_directory
|
||||||
|
+ _service_container_copy_mounts
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
_service_all_template_mounts: >-
|
_service_all_template_mounts: >-
|
||||||
{{
|
{{
|
||||||
(
|
(
|
||||||
_service_template_mounts +
|
_service_template_mounts
|
||||||
(
|
+ (
|
||||||
_service_additional_containers |
|
_service_additional_containers
|
||||||
map(attribute='mounts', default=[]) |
|
| map(attribute='mounts', default=[])
|
||||||
flatten
|
| flatten
|
||||||
)
|
)
|
||||||
) |
|
)
|
||||||
selectattr('type', '==', 'template') |
|
| selectattr('type', '==', 'template')
|
||||||
unique
|
| unique
|
||||||
}}
|
|
||||||
_service_all_template_mount_directories: >-
|
|
||||||
{{
|
|
||||||
_service_all_template_mounts |
|
|
||||||
map(attribute='source') |
|
|
||||||
map('dirname') |
|
|
||||||
unique |
|
|
||||||
select('!=', '')
|
|
||||||
}}
|
}}
|
||||||
_service_all_template_mount_host_files: >-
|
_service_all_template_mount_host_files: >-
|
||||||
{{
|
{{
|
||||||
_service_all_template_mounts |
|
_service_all_template_mounts
|
||||||
map(attribute='source') |
|
| map(attribute='destination')
|
||||||
map('regex_replace', '\.j2$', '') |
|
| map('dirname')
|
||||||
map('regex_replace', '^', _service_host_directory ~ '/mounts/')
|
| map('replace', '/', '_')
|
||||||
|
| map('regex_replace', '^', _service_host_directory ~ '/mounts/')
|
||||||
|
| zip(
|
||||||
|
_service_all_template_mounts
|
||||||
|
| map(attribute='destination')
|
||||||
|
| map('basename')
|
||||||
|
)
|
||||||
|
| map('path_join')
|
||||||
|
}}
|
||||||
|
_service_all_template_mounts_full: >-
|
||||||
|
{{
|
||||||
|
([{'readonly': true, 'template_directory': false}] * _service_all_template_mounts | length)
|
||||||
|
| zip(
|
||||||
|
_service_all_template_mounts,
|
||||||
|
_service_all_template_mount_host_files | map('community.general.dict_kv', 'hostfile')
|
||||||
|
)
|
||||||
|
| map('combine')
|
||||||
}}
|
}}
|
||||||
|
|
||||||
_service_all_copy_mounts: >-
|
_service_all_copy_mounts: >-
|
||||||
@@ -109,7 +157,7 @@ _service_all_copy_mounts: >-
|
|||||||
}}
|
}}
|
||||||
_service_all_copy_mount_host_files: >-
|
_service_all_copy_mount_host_files: >-
|
||||||
{{
|
{{
|
||||||
_service_all_copy_mounts |
|
_service_all_copy_mounts
|
||||||
map(attribute='source') |
|
| map(attribute='source')
|
||||||
map('regex_replace', '^', _service_host_directory ~ '/mounts/')
|
| map('regex_replace', '^', _service_host_directory ~ '/mounts/')
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -2,34 +2,34 @@
|
|||||||
_service_container_secrets: >-
|
_service_container_secrets: >-
|
||||||
{{
|
{{
|
||||||
service_container_secrets
|
service_container_secrets
|
||||||
|
| map(attribute='name')
|
||||||
|
| map('community.general.dict_kv', 'target')
|
||||||
|
| zip(
|
||||||
|
service_container_secrets,
|
||||||
|
service_container_secrets
|
||||||
| map(attribute='name')
|
| map(attribute='name')
|
||||||
| map('community.general.dict_kv', 'target')
|
| map('regex_replace', '^', service_name ~ '-')
|
||||||
| zip(
|
| map('community.general.dict_kv', 'name')
|
||||||
service_container_secrets,
|
)
|
||||||
service_container_secrets
|
| map('combine')
|
||||||
| map(attribute='name')
|
+ (
|
||||||
| map('regex_replace', '^', service_name ~ '-')
|
[{
|
||||||
| map('community.general.dict_kv', 'name')
|
'name': _service_database_name,
|
||||||
)
|
'type': service_database_secret_type,
|
||||||
| map('combine')
|
'target': service_database_secret_target
|
||||||
+ (
|
}] if _service_setup_database else []
|
||||||
[{
|
)
|
||||||
'name': _service_database_name,
|
+ (
|
||||||
'type': service_database_secret_type,
|
[{
|
||||||
'target': service_database_secret_target
|
'name': _service_database_name ~ '-url',
|
||||||
}] if _service_setup_database else []
|
'value':
|
||||||
)
|
'postgres://'
|
||||||
+ (
|
~ service_name | replace('-', '_')
|
||||||
[{
|
~ ':' ~ service_podman_secrets[service_name ~ '-postgres']
|
||||||
'name': _service_database_name ~ '-url',
|
~ '@postgres/' ~ service_name | replace('-', '_')
|
||||||
'value':
|
~ '?sslmode=disable',
|
||||||
'postgres://'
|
'type': service_database_secret_type,
|
||||||
~ service_name | replace('-', '_')
|
'target': service_database_secret_target ~ '-url'
|
||||||
~ ':' ~ service_podman_secrets[service_name ~ '-postgres']
|
}] if service_podman_secrets[service_name ~ '-postgres'] is defined else []
|
||||||
~ '@postgres/' ~ service_name | replace('-', '_')
|
)
|
||||||
~ '?sslmode=disable',
|
|
||||||
'type': service_database_secret_type,
|
|
||||||
'target': service_database_secret_target ~ '-url'
|
|
||||||
}] if service_podman_secrets[service_name ~ '-postgres'] is defined else []
|
|
||||||
)
|
|
||||||
}}
|
}}
|
||||||
|
|||||||
24
roles/service/vars/main/template_validate.yaml
Normal file
24
roles/service/vars/main/template_validate.yaml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
---
|
||||||
|
_service_template_validate_secrets: >-
|
||||||
|
{{
|
||||||
|
_service_container_secrets
|
||||||
|
| map(attribute='name')
|
||||||
|
| zip(
|
||||||
|
_service_container_secrets
|
||||||
|
| community.general.remove_keys(['name', 'value', 'length'])
|
||||||
|
| map('items')
|
||||||
|
| map('map', 'join', '=')
|
||||||
|
| map('join', ',')
|
||||||
|
)
|
||||||
|
| map('join', ',')
|
||||||
|
| map('regex_replace', '^', '--secret ')
|
||||||
|
| join(' ')
|
||||||
|
}}
|
||||||
|
|
||||||
|
_service_template_validate_command: >-
|
||||||
|
podman run --rm
|
||||||
|
-v %s:{{ item.destination }}:ro
|
||||||
|
--entrypoint {{ item.template_validate_command.split(' ', 1)[0] }}
|
||||||
|
{{ _service_template_validate_secrets }}
|
||||||
|
{{ service_container_image }}
|
||||||
|
{{ item.template_validate_command.split(' ', 1)[1] }}
|
||||||
@@ -19,3 +19,5 @@ synapse_auto_join_rooms: []
|
|||||||
|
|
||||||
synapse_smtp_server: ""
|
synapse_smtp_server: ""
|
||||||
synapse_oidc_provider_client_id: ""
|
synapse_oidc_provider_client_id: ""
|
||||||
|
|
||||||
|
synapse_appservices: []
|
||||||
|
|||||||
@@ -116,3 +116,29 @@ argument_specs:
|
|||||||
type: str
|
type: str
|
||||||
required: false
|
required: false
|
||||||
default: 16-alpine
|
default: 16-alpine
|
||||||
|
|
||||||
|
synapse_appservices:
|
||||||
|
description: List of appservices to run with synapse. They will be installed in separate containers.
|
||||||
|
type: list
|
||||||
|
required: false
|
||||||
|
default: []
|
||||||
|
elements: dict
|
||||||
|
options:
|
||||||
|
id:
|
||||||
|
description: A unique, user-defined ID of the application service which will never change
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
host:
|
||||||
|
description: Hostname the appservice is accessible to synapse at
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
as_token:
|
||||||
|
description: A secret token that the application service will use to authenticate requests to the homeserver
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
hs_token:
|
||||||
|
description: A secret token that the homeserver will use authenticate requests to the application service
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
synapse_doublepuppet_token:
|
||||||
|
description: Double puppeting token for appservices. Required if synapse_appservices is not empty.
|
||||||
|
|||||||
@@ -15,26 +15,11 @@
|
|||||||
name: service
|
name: service
|
||||||
vars:
|
vars:
|
||||||
service_name: synapse
|
service_name: synapse
|
||||||
service_container_image: "{{ _synapse_image_name }}"
|
service_container_image: ghcr.io/element-hq/synapse:latest
|
||||||
service_database_type: postgres
|
service_database_type: postgres
|
||||||
service_postgres_tag: "{{ synapse_postgres_tag }}"
|
service_postgres_tag: "{{ synapse_postgres_tag }}"
|
||||||
service_container_mounts:
|
service_container_mounts: "{{ _synapse_mounts }}"
|
||||||
- type: template
|
service_container_secrets: "{{ _synapse_secrets }}"
|
||||||
source: homeserver.yaml.j2
|
|
||||||
destination: /data/homeserver.yaml
|
|
||||||
- type: template
|
|
||||||
source: log.yaml.j2
|
|
||||||
destination: /data/log.yaml
|
|
||||||
- type: volume
|
|
||||||
source: media
|
|
||||||
destination: /data/media
|
|
||||||
user: "991"
|
|
||||||
group: "991"
|
|
||||||
service_container_secrets:
|
|
||||||
- name: signing-key
|
|
||||||
value: "{{ synapse_signing_key }}"
|
|
||||||
- name: mas-client-secret
|
|
||||||
- name: mas-homeserver-secret
|
|
||||||
service_container_env:
|
service_container_env:
|
||||||
SYNAPSE_SERVER_NAME: "{{ synapse_server_name }}"
|
SYNAPSE_SERVER_NAME: "{{ synapse_server_name }}"
|
||||||
SYNAPSE_REPORT_STATS: "no"
|
SYNAPSE_REPORT_STATS: "no"
|
||||||
@@ -47,13 +32,14 @@
|
|||||||
proxy_target_socket: /run/matrix-authentication-service-caddy-socket-proxy.sock
|
proxy_target_socket: /run/matrix-authentication-service-caddy-socket-proxy.sock
|
||||||
service_wants:
|
service_wants:
|
||||||
- matrix-authentication-service.service
|
- matrix-authentication-service.service
|
||||||
|
service_container_additional_networks: "{{ _synapse_additional_networks }}"
|
||||||
|
|
||||||
- name: Matrix authentication service for synapse
|
- name: Matrix authentication service for synapse
|
||||||
ansible.builtin.import_role:
|
ansible.builtin.import_role:
|
||||||
name: matrix_authentication_service
|
name: matrix_authentication_service
|
||||||
vars:
|
vars:
|
||||||
matrix_authentication_service_additional_networks:
|
matrix_authentication_service_additional_networks:
|
||||||
- synapse
|
- synapse-mas
|
||||||
matrix_authentication_service_secrets: "{{ synapse_mas_secrets }}"
|
matrix_authentication_service_secrets: "{{ synapse_mas_secrets }}"
|
||||||
matrix_authentication_service_domain: "{{ synapse_mas_domain }}"
|
matrix_authentication_service_domain: "{{ synapse_mas_domain }}"
|
||||||
matrix_authentication_service_homeserver_name: "{{ synapse_server_name }}"
|
matrix_authentication_service_homeserver_name: "{{ synapse_server_name }}"
|
||||||
|
|||||||
21
roles/synapse/templates/appservice-registration.yaml.j2
Normal file
21
roles/synapse/templates/appservice-registration.yaml.j2
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
# vim:ft=yaml
|
||||||
|
# {{ ansible_managed }}
|
||||||
|
{% set id = item.destination.split('/')[-1].split('-')[0] %}
|
||||||
|
{% set appservice = synapse_appservices | selectattr('id', 'equalto', id) | first %}
|
||||||
|
|
||||||
|
id: {{ id }}
|
||||||
|
url: http://{{ appservice.host }}:8080
|
||||||
|
as_token: {{ appservice.as_token }}
|
||||||
|
hs_token: {{ appservice.hs_token }}
|
||||||
|
sender_localpart: {{ id }}senderlocalpart
|
||||||
|
rate_limited: false
|
||||||
|
namespaces:
|
||||||
|
users:
|
||||||
|
- regex: ^@{{ id }}bot:{{ synapse_server_name | replace('.', '\.') }}$
|
||||||
|
exclusive: true
|
||||||
|
- regex: ^@{{ id }}_.*:{{ synapse_server_name | replace('.', '\.') }}$
|
||||||
|
exclusive: true
|
||||||
|
de.sorunome.msc2409.push_ephemeral: true
|
||||||
|
receive_ephemeral: true
|
||||||
|
io.element.msc4190: true
|
||||||
15
roles/synapse/templates/doublepuppet-registration.yaml.j2
Normal file
15
roles/synapse/templates/doublepuppet-registration.yaml.j2
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
# vim:ft=yaml
|
||||||
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
|
id: doublepuppet
|
||||||
|
url:
|
||||||
|
as_token: "{{ synapse_doublepuppet_token }}"
|
||||||
|
hs_token: doublepuppethstoken
|
||||||
|
sender_localpart: doublepuppetsenderlocalpart
|
||||||
|
rate_limited: false
|
||||||
|
|
||||||
|
namespaces:
|
||||||
|
users:
|
||||||
|
- regex: '@.*:{{ synapse_server_name | replace(".", "\.") }}'
|
||||||
|
exclusive: false
|
||||||
@@ -81,7 +81,7 @@ url_preview_ip_range_blacklist:
|
|||||||
|
|
||||||
turn_uris: {{ synapse_turn_uris }}
|
turn_uris: {{ synapse_turn_uris }}
|
||||||
{% if synapse_turn_uris | length > 0 %}
|
{% if synapse_turn_uris | length > 0 %}
|
||||||
turn_shared_secret: {{ synapse_turn_shared_secret }}
|
turn_shared_secret_file: /run/secrets/turn-shared-secret
|
||||||
{% endif %}
|
{% endif %}
|
||||||
turn_user_lifetime: 1d
|
turn_user_lifetime: 1d
|
||||||
turn_allow_guests: false
|
turn_allow_guests: false
|
||||||
@@ -109,4 +109,10 @@ autocreate_auto_join_rooms: false
|
|||||||
matrix_authentication_service:
|
matrix_authentication_service:
|
||||||
enabled: true
|
enabled: true
|
||||||
endpoint: http://matrix-authentication-service:8080/
|
endpoint: http://matrix-authentication-service:8080/
|
||||||
secret: "{{ service_podman_secrets['synapse-mas-homeserver-secret'] }}"
|
secret_path: /run/secrets/mas-homeserver-secret
|
||||||
|
|
||||||
|
{% if synapse_appservices | length > 0 %}
|
||||||
|
app_service_config_files:
|
||||||
|
- {{ _synapse_doublepuppet_registration_mount.destination }}
|
||||||
|
{{ _synapse_appservice_registration_mounts | map(attribute='destination') | to_nice_yaml | indent(2) }}
|
||||||
|
{% endif %}
|
||||||
|
|||||||
@@ -1,2 +1,59 @@
|
|||||||
---
|
---
|
||||||
_synapse_image_name: ghcr.io/element-hq/synapse:latest
|
_synapse_additional_networks: >-
|
||||||
|
{{
|
||||||
|
['synapse-mas']
|
||||||
|
+ (
|
||||||
|
synapse_appservices
|
||||||
|
| map(attribute='host')
|
||||||
|
| map('regex_replace', '^', 'synapse-')
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
|
||||||
|
_synapse_main_secrets:
|
||||||
|
- name: signing-key
|
||||||
|
value: "{{ synapse_signing_key }}"
|
||||||
|
- name: mas-client-secret
|
||||||
|
- name: mas-homeserver-secret
|
||||||
|
_synapse_turn_secrets:
|
||||||
|
- name: turn-shared-secret
|
||||||
|
value: "{{ synapse_turn_shared_secret }}"
|
||||||
|
_synapse_secrets: >-
|
||||||
|
{{
|
||||||
|
_synapse_main_secrets
|
||||||
|
+ (_synapse_turn_secrets if synapse_turn_uris | length > 0 else [])
|
||||||
|
}}
|
||||||
|
|
||||||
|
_synapse_base_mounts:
|
||||||
|
- type: template
|
||||||
|
source: homeserver.yaml.j2
|
||||||
|
destination: /data/homeserver.yaml
|
||||||
|
template_validate_command: python -m synapse.config -c /data/homeserver.yaml --no-secrets-in-config
|
||||||
|
- type: template
|
||||||
|
source: log.yaml.j2
|
||||||
|
destination: /data/log.yaml
|
||||||
|
- type: volume
|
||||||
|
source: media
|
||||||
|
destination: /data/media
|
||||||
|
user: "991"
|
||||||
|
group: "991"
|
||||||
|
_synapse_doublepuppet_registration_mount:
|
||||||
|
type: template
|
||||||
|
source: doublepuppet-registration.yaml.j2
|
||||||
|
destination: /data/doublepuppet-registration.yaml
|
||||||
|
_synapse_appservice_registration_mounts: >-
|
||||||
|
{{
|
||||||
|
([{'type': 'template', 'source': 'appservice-registration.yaml.j2'}] * synapse_appservices | length)
|
||||||
|
| zip(
|
||||||
|
synapse_appservices
|
||||||
|
| map(attribute='id')
|
||||||
|
| map('regex_replace', '^', '/data/appservices/')
|
||||||
|
| map('regex_replace', '$', '-registration.yaml')
|
||||||
|
| map('community.general.dict_kv', 'destination')
|
||||||
|
) | map('combine')
|
||||||
|
}}
|
||||||
|
_synapse_mounts: >-
|
||||||
|
{{
|
||||||
|
_synapse_base_mounts
|
||||||
|
+ ([_synapse_doublepuppet_registration_mount] if synapse_appservices | length > 0 else [])
|
||||||
|
+ _synapse_appservice_registration_mounts
|
||||||
|
}}
|
||||||
|
|||||||
Reference in New Issue
Block a user