From ab407b2ae3167b6fd0df7b9bcbffdbd8d39e5cc8 Mon Sep 17 00:00:00 2001
From: jabertwo <git@jabertwo.de>
Date: Tue, 3 Sep 2024 14:29:58 +0200
Subject: [PATCH] use {{ basedir }} in matrix
---
webserver/docker_matrix/tasks/main.yml | 22 +++++++++----------
.../templates/docker-compose.yml | 12 +++++-----
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/webserver/docker_matrix/tasks/main.yml b/webserver/docker_matrix/tasks/main.yml
index 27dc2fda..fd773fce 100644
--- a/webserver/docker_matrix/tasks/main.yml
+++ b/webserver/docker_matrix/tasks/main.yml
@@ -4,8 +4,8 @@
with_items:
- { path: /srv/shared/noreply_email_pass, length: -1 }
- { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 }
- - { path: /srv/matrix/postgres_user_pass, length: 24 }
- - { path: /srv/matrix/admin_access_token, length: -1 } # Get in Element fo an Admin User: Settings > Help > Advanced
+ - { path: "{{ basedir }}/postgres_user_pass", length: 24 }
+ - { path: "{{ basedir }}/admin_access_token", length: -1 } # Get in Element fo an Admin User: Settings > Help > Advanced
- name: create folder struct for matrix
@@ -15,10 +15,10 @@
owner: www-data
group: www-data
with_items:
- - "/srv/matrix/"
- - "/srv/matrix/ma1sd-config/"
- - "/srv/matrix/ma1sd-data/"
- - "/srv/matrix/synapse-data/"
+ - "{{ basedir }}/"
+ - "{{ basedir }}/ma1sd-config/"
+ - "{{ basedir }}/ma1sd-data/"
+ - "{{ basedir }}/synapse-data/"
- name: create folder struct for matrix db
@@ -28,13 +28,13 @@
owner: "999"
group: "999"
with_items:
- - "/srv/matrix/db/"
+ - "{{ basedir }}/db/"
- name: Konfig-Dateien erstellen
template:
src: "{{ item }}"
- dest: "/srv/matrix/{{ item }}"
+ dest: "{{ basedir }}/{{ item }}"
with_items:
- docker-compose.yml
- rest_auth_provider.py
@@ -47,7 +47,7 @@
- name: Script-Dateien erstellen
template:
src: "{{ item }}"
- dest: "/srv/matrix/{{ item }}"
+ dest: "{{ basedir }}/{{ item }}"
mode: "ug+rwx"
with_items:
- purgemediacache.sh
@@ -55,11 +55,11 @@
- name: stop matrix docker
community.docker.docker_compose_v2:
- project_src: /srv/matrix/
+ project_src: "{{ basedir }}"
state: absent
when: configs.changed
- name: start matrix docker
community.docker.docker_compose_v2:
- project_src: /srv/matrix/
+ project_src: "{{ basedir }}"
state: present
diff --git a/webserver/docker_matrix/templates/docker-compose.yml b/webserver/docker_matrix/templates/docker-compose.yml
index fb47a54e..88d52b88 100644
--- a/webserver/docker_matrix/templates/docker-compose.yml
+++ b/webserver/docker_matrix/templates/docker-compose.yml
@@ -14,7 +14,7 @@ services:
image: postgres:16
restart: always
volumes:
- - /srv/matrix/db:/var/lib/postgresql/data
+ - {{ basedir }}/db:/var/lib/postgresql/data
environment:
POSTGRES_DB: synapse
POSTGRES_USER: synapse
@@ -33,9 +33,9 @@ services:
- db
- ma1sd
volumes:
- - /srv/matrix/synapse-data/:/data
+ - {{ basedir }}/synapse-data/:/data
# Python version can be found in the dockerfile: https://github.com/matrix-org/synapse/blob/develop/docker/Dockerfile check for tag to get the correct version
- - /srv/matrix/rest_auth_provider.py:/usr/local/lib/python3.11/site-packages/rest_auth_provider.py
+ - {{ basedir }}/rest_auth_provider.py:/usr/local/lib/python3.11/site-packages/rest_auth_provider.py
environment:
SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml"
TZ: "Europe/Berlin"
@@ -58,8 +58,8 @@ services:
image: ma1uta/ma1sd:2.5.0
restart: always
volumes:
- - /srv/matrix/ma1sd-config/:/etc/ma1sd
- - /srv/matrix/ma1sd-data/:/var/ma1sd
+ - {{ basedir }}/ma1sd-config/:/etc/ma1sd
+ - {{ basedir }}/ma1sd-data/:/var/ma1sd
labels:
- com.centurylinklabs.watchtower.enable=false
- traefik.enable=true
@@ -78,7 +78,7 @@ services:
depends_on:
- synapse
volumes:
- - /srv/matrix/purgemediacache.sh:/curl.sh
+ - {{ basedir }}/purgemediacache.sh:/curl.sh
environment:
CRON_SCHEDULE: "0 7 * * *"
networks:
--
GitLab