Skip to content
Snippets Groups Projects
Commit ab407b2a authored by jabertwo's avatar jabertwo
Browse files

use {{ basedir }} in matrix

parent 66b57c55
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
with_items: with_items:
- { path: /srv/shared/noreply_email_pass, length: -1 } - { path: /srv/shared/noreply_email_pass, length: -1 }
- { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 } - { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 }
- { path: /srv/matrix/postgres_user_pass, length: 24 } - { path: "{{ basedir }}/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 }}/admin_access_token", length: -1 } # Get in Element fo an Admin User: Settings > Help > Advanced
- name: create folder struct for matrix - name: create folder struct for matrix
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
owner: www-data owner: www-data
group: www-data group: www-data
with_items: with_items:
- "/srv/matrix/" - "{{ basedir }}/"
- "/srv/matrix/ma1sd-config/" - "{{ basedir }}/ma1sd-config/"
- "/srv/matrix/ma1sd-data/" - "{{ basedir }}/ma1sd-data/"
- "/srv/matrix/synapse-data/" - "{{ basedir }}/synapse-data/"
- name: create folder struct for matrix db - name: create folder struct for matrix db
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
owner: "999" owner: "999"
group: "999" group: "999"
with_items: with_items:
- "/srv/matrix/db/" - "{{ basedir }}/db/"
- name: Konfig-Dateien erstellen - name: Konfig-Dateien erstellen
template: template:
src: "{{ item }}" src: "{{ item }}"
dest: "/srv/matrix/{{ item }}" dest: "{{ basedir }}/{{ item }}"
with_items: with_items:
- docker-compose.yml - docker-compose.yml
- rest_auth_provider.py - rest_auth_provider.py
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
- name: Script-Dateien erstellen - name: Script-Dateien erstellen
template: template:
src: "{{ item }}" src: "{{ item }}"
dest: "/srv/matrix/{{ item }}" dest: "{{ basedir }}/{{ item }}"
mode: "ug+rwx" mode: "ug+rwx"
with_items: with_items:
- purgemediacache.sh - purgemediacache.sh
...@@ -55,11 +55,11 @@ ...@@ -55,11 +55,11 @@
- name: stop matrix docker - name: stop matrix docker
community.docker.docker_compose_v2: community.docker.docker_compose_v2:
project_src: /srv/matrix/ project_src: "{{ basedir }}"
state: absent state: absent
when: configs.changed when: configs.changed
- name: start matrix docker - name: start matrix docker
community.docker.docker_compose_v2: community.docker.docker_compose_v2:
project_src: /srv/matrix/ project_src: "{{ basedir }}"
state: present state: present
...@@ -14,7 +14,7 @@ services: ...@@ -14,7 +14,7 @@ services:
image: postgres:16 image: postgres:16
restart: always restart: always
volumes: volumes:
- /srv/matrix/db:/var/lib/postgresql/data - {{ basedir }}/db:/var/lib/postgresql/data
environment: environment:
POSTGRES_DB: synapse POSTGRES_DB: synapse
POSTGRES_USER: synapse POSTGRES_USER: synapse
...@@ -33,9 +33,9 @@ services: ...@@ -33,9 +33,9 @@ services:
- db - db
- ma1sd - ma1sd
volumes: 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 # 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: environment:
SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml" SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml"
TZ: "Europe/Berlin" TZ: "Europe/Berlin"
...@@ -58,8 +58,8 @@ services: ...@@ -58,8 +58,8 @@ services:
image: ma1uta/ma1sd:2.5.0 image: ma1uta/ma1sd:2.5.0
restart: always restart: always
volumes: volumes:
- /srv/matrix/ma1sd-config/:/etc/ma1sd - {{ basedir }}/ma1sd-config/:/etc/ma1sd
- /srv/matrix/ma1sd-data/:/var/ma1sd - {{ basedir }}/ma1sd-data/:/var/ma1sd
labels: labels:
- com.centurylinklabs.watchtower.enable=false - com.centurylinklabs.watchtower.enable=false
- traefik.enable=true - traefik.enable=true
...@@ -78,7 +78,7 @@ services: ...@@ -78,7 +78,7 @@ services:
depends_on: depends_on:
- synapse - synapse
volumes: volumes:
- /srv/matrix/purgemediacache.sh:/curl.sh - {{ basedir }}/purgemediacache.sh:/curl.sh
environment: environment:
CRON_SCHEDULE: "0 7 * * *" CRON_SCHEDULE: "0 7 * * *"
networks: networks:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment