ungleich-intern/matrix-docker-compose
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

synapse: add /certs import support

Browse source
This commit is contained in:
Nico Schottelius 2024-02-29 10:58:17 +09:00
parent ef281b0321
commit 27b5b87bad
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ansible/roles/synapse/files/basedir/docker-compose.yaml
View file

@ -6,6 +6,10 @@ services:
- /mnt/synapse_data:/data - /mnt/synapse_data:/data
- ./config:/config - ./config:/config
- /mnt/logs/synapse:/logs - /mnt/logs/synapse:/logs
- /etc/pki/ca-trust/source/anchors/:/certs
- ./start.sh:/start.sh
entrypoint:
- /start.sh
command: command:
- run - run
- --config-path=/config/homeserver.yaml - --config-path=/config/homeserver.yaml
@ -14,6 +18,8 @@ services:
synapse-worker-generic: synapse-worker-generic:
image: matrixdotorg/synapse:${SYNAPSE_VERSION} image: matrixdotorg/synapse:${SYNAPSE_VERSION}
entrypoint:
- /start.sh
command: command:
- run - run
- "--config-path=/config/homeserver.yaml" - "--config-path=/config/homeserver.yaml"
@ -22,6 +28,8 @@ services:
- /mnt/synapse_data:/data - /mnt/synapse_data:/data
- ./config:/config - ./config:/config
- /mnt/logs/synapse:/logs - /mnt/logs/synapse:/logs
- /etc/pki/ca-trust/source/anchors/:/certs
- ./start.sh:/start.sh
environment: environment:
SYNAPSE_WORKER: synapse.app.generic_worker SYNAPSE_WORKER: synapse.app.generic_worker
depends_on: depends_on:
@ -31,6 +39,8 @@ services:
synapse-worker-sync: synapse-worker-sync:
image: matrixdotorg/synapse:${SYNAPSE_VERSION} image: matrixdotorg/synapse:${SYNAPSE_VERSION}
entrypoint:
- /start.sh
command: command:
- run - run
- "--config-path=/config/homeserver.yaml" - "--config-path=/config/homeserver.yaml"
@ -39,6 +49,8 @@ services:
- /mnt/synapse_data:/data - /mnt/synapse_data:/data
- ./config:/config - ./config:/config
- /mnt/logs/synapse:/logs - /mnt/logs/synapse:/logs
- /etc/pki/ca-trust/source/anchors/:/certs
- ./start.sh:/start.sh
environment: environment:
SYNAPSE_WORKER: synapse.app.generic_worker SYNAPSE_WORKER: synapse.app.generic_worker
depends_on: depends_on:
@ -48,6 +60,8 @@ services:
synapse-worker-federation: synapse-worker-federation:
image: matrixdotorg/synapse:${SYNAPSE_VERSION} image: matrixdotorg/synapse:${SYNAPSE_VERSION}
entrypoint:
- /start.sh
command: command:
- run - run
- "--config-path=/config/homeserver.yaml" - "--config-path=/config/homeserver.yaml"
@ -56,6 +70,8 @@ services:
- /mnt/synapse_data:/data - /mnt/synapse_data:/data
- ./config:/config - ./config:/config
- /mnt/logs/synapse:/logs - /mnt/logs/synapse:/logs
- /etc/pki/ca-trust/source/anchors/:/certs
- ./start.sh:/start.sh
environment: environment:
SYNAPSE_WORKER: synapse.app.generic_worker SYNAPSE_WORKER: synapse.app.generic_worker
depends_on: depends_on:

4
ansible/roles/synapse/files/basedir/start.sh Normal file → Executable file
View file

@ -4,3 +4,7 @@ cnt=$(ls -1 /certs 2>/dev/null|wc -l)
if [ $cnt -gt 0 ]; then if [ $cnt -gt 0 ]; then
cp /certs/* /usr/local/share/ca-certificates cp /certs/* /usr/local/share/ca-certificates
update-ca-certificates
fi
/start.py "$@"

7
ansible/roles/synapse/tasks/main.yml
View file

@ -6,6 +6,13 @@
mode: '0644' mode: '0644'
tags: tags:
- files - files
- name: Make start.sh executable
ansible.builtin.file:
path: /home/{{ ansible_user }}/docker_compose/{{ matrix_service }}/start.sh
owner: "{{ ansible_user }}"
mode: '0755'
tags:
- files
- name: Create nginx dir - name: Create nginx dir
ansible.builtin.file: ansible.builtin.file:
path: /home/{{ ansible_user }}/docker_compose/{{ matrix_service }}/nginx path: /home/{{ ansible_user }}/docker_compose/{{ matrix_service }}/nginx