Nginx variable refactoring and general bug solving. Got interupted commit not tested

This commit is contained in:
2025-01-31 13:14:07 +01:00
parent b96d95f3e4
commit 11752f5e2e
23 changed files with 59 additions and 48 deletions

View File

@@ -6,7 +6,7 @@
include_tasks: certbot-matomo.yml
vars:
domain: "{{domains.matrix_synapse}}"
http_port: "{{ports.localhost.http_port[matrix_synapse]}}"
http_port: "{{ports.localhost.http_ports.matrix_synapse}}"
- name: create {{well_known_directory}}
file:
@@ -22,17 +22,17 @@
- name: create {{domains.matrix_synapse}}.conf
template:
src: "templates/nginx.conf.j2"
dest: "{{nginx_servers_directory}}{{domains.matrix_synapse}}.conf"
dest: "{{nginx.directories.http.servers}}{{domains.matrix_synapse}}.conf"
vars:
domain: "{{domains.matrix_synapse}}"
http_port: "{{ports.localhost.http_port[matrix_synapse]}}"
http_port: "{{ports.localhost.http_ports.matrix_synapse}}"
notify: restart nginx
- name: "include tasks nginx-docker-proxy-domain.yml for element"
include_tasks: nginx-docker-proxy-domain.yml
vars:
domain: "{{domains.matrix_element}}"
http_port: "{{ports.localhost.http_port[matrix_element]}}"
http_port: "{{ports.localhost.http_ports.matrix_element}}"
- name: include create-and-seed-database.yml for multiple bridges
include_tasks: create-and-seed-database.yml

View File

@@ -19,7 +19,7 @@ services:
- SYNAPSE_SERVER_NAME={{domains.matrix_synapse}}
- SYNAPSE_REPORT_STATS=no
ports:
- "127.0.0.1:{{ports.localhost.http_port[matrix_synapse]}}:8008"
- "127.0.0.1:{{ports.localhost.http_ports.matrix_synapse}}:8008"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8008/"]
interval: 1m
@@ -39,7 +39,7 @@ services:
volumes:
- ./element-config.json:/app/config.json
ports:
- "127.0.0.1:{{ports.localhost.http_port[matrix_element]}}:80"
- "127.0.0.1:{{ports.localhost.http_ports.matrix_element}}:80"
healthcheck:
test: ["CMD", "wget", "--spider", "-q", "http://localhost:80/"]
interval: 1m

View File

@@ -3,7 +3,7 @@ application_id: "matrix"
database_password: "{{matrix_database_password}}"
database_type: "postgres"
registration_file_folder: "/data/"
well_known_directory: "{{nginx_well_known_root}}/matrix/"
well_known_directory: "{{nginx.directories.well_known}}/matrix/"
bridges:
- database_password: "{{ mautrix_whatsapp_bridge_database_password }}"