kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-02-22 12:29:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Solved matrix port bug

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-02-03 23:07:42 +01:00
parent 75ff756808
commit 207030cb48
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all/09_ports.yml
View File

@ -25,7 +25,7 @@ ports:
roulette-wheel: 8013 roulette-wheel: 8013
joomla: 8014 joomla: 8014
attendize: 8015 attendize: 8015
matrix: 8016 #matrix: 8016 Not used anymore
baserow: 8017 baserow: 8017
matomo: 8018 matomo: 8018
listmonk: 8019 listmonk: 8019

5
roles/docker-compose/tasks/main.yml
View File

@ -5,11 +5,12 @@
- name: "Set global domain based on application_id" - name: "Set global domain based on application_id"
set_fact: set_fact:
domain: "{{ domains[application_id] if application_id in domains else None }}" domain: "{{ domains[application_id] if application_id in domains else None }}"
# Default case: One Domain exists. Some applications like matrix don't have an default key # Default case: One domain exists. Some applications like matrix don't have an default domain
- name: "Set global http_port to {{ ports.localhost.http_ports[application_id] }}" - name: "Set global http_port to {{ ports.localhost.http_ports[application_id] }}"
set_fact: set_fact:
http_port: "{{ ports.localhost.http_ports[application_id] }}" http_port: "{{ ports.localhost.http_ports[application_id] if application_id in ports.localhost.http_ports else None }}"
# Default case: One port exists. Some applications like matrix don't have an default port
- name: "remove {{ docker_compose_instance_directory }} and all its contents" - name: "remove {{ docker_compose_instance_directory }} and all its contents"
file: file:

1
roles/docker-matrix-compose/templates/nginx.conf.j2
View File

@ -1,6 +1,7 @@
server { server {
# Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary # Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary
{% set domain = domains.matrix_synapse %} {% set domain = domains.matrix_synapse %}
{% set http_port = ports.localhost.http_ports.matrix_synapse %}
server_name {{domain}}; server_name {{domain}};
{% include 'roles/letsencrypt/templates/ssl_header.j2' %} {% include 'roles/letsencrypt/templates/ssl_header.j2' %}