From 1849d6b7a19b4140986caa9a7f29277d5ecb0932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Wed, 20 Mar 2024 00:07:15 +0100
Subject: [PATCH] [fix] role:synapse:Variablennamen

---
 ansible/roles/synapse/defaults/main.json         | 14 +++++++-------
 .../roles/synapse/templates/homeserver.yaml.j2   | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ansible/roles/synapse/defaults/main.json b/ansible/roles/synapse/defaults/main.json
index a57ac35..28ee5e3 100644
--- a/ansible/roles/synapse/defaults/main.json
+++ b/ansible/roles/synapse/defaults/main.json
@@ -1,13 +1,13 @@
 {
 	"var_synapse_scheme": "https",
 	"var_synapse_domain": "synapse.example.org",
-	"var_synaspe_database_kind": "sqlite",
-	"var_synaspe_database_sqlite_path": "/var/synapse/data.sqlite",
-	"var_synaspe_database_postgresql_host": "localhost",
-	"var_synaspe_database_postgresql_port": "5432",
-	"var_synaspe_database_postgresql_username": "synapse_user",
-	"var_synaspe_database_postgresql_password": "REPLACE_ME",
-	"var_synaspe_database_postgresql_schema": "synapse",
+	"var_synapse_database_kind": "sqlite",
+	"var_synapse_database_data_sqlite_path": "/var/synapse/data.sqlite",
+	"var_synapse_database_data_postgresql_host": "localhost",
+	"var_synapse_database_data_postgresql_port": 5432,
+	"var_synapse_database_data_postgresql_username": "synapse_user",
+	"var_synapse_database_data_postgresql_password": "REPLACE_ME",
+	"var_synapse_database_data_postgresql_schema": "synapse",
 	"var_synapse_element_url": "https://element.example.org",
 	"var_synapse_title": "Example | Matrix",
 	"var_synapse_federation_whitelist": [],
diff --git a/ansible/roles/synapse/templates/homeserver.yaml.j2 b/ansible/roles/synapse/templates/homeserver.yaml.j2
index de8088e..06e7079 100644
--- a/ansible/roles/synapse/templates/homeserver.yaml.j2
+++ b/ansible/roles/synapse/templates/homeserver.yaml.j2
@@ -1,19 +1,19 @@
-{% if var_synaspe_database_kind == 'sqlite' %}
+{% if var_synapse_database_kind == 'sqlite' %}
 database:
   name: sqlite3
   args:
-    database: {{var_synaspe_database_sqlite_path}}
+    database: {{var_synapse_database_sqlite_path}}
 {% endif %}
 
-{% if var_synaspe_database_kind == 'postgresql' %}
+{% if var_synapse_database_kind == 'postgresql' %}
 database:
   name: psycopg2
   args:
-    host: {{var_synapse_database_postgresql_host}}
-    port: {{var_synapse_database_postgresql_port}}
-    database: "{{var_synapse_database_postgresql_schema}}"
-    user: "{{var_synapse_database_postgresql_username}}"
-    password: "{{var_synapse_database_postgresql_password}}"
+    host: {{var_synapse_database_data_postgresql_host}}
+    port: {{var_synapse_database_data_postgresql_port | string}}
+    database: "{{var_synapse_database_data_postgresql_schema}}"
+    user: "{{var_synapse_database_data_postgresql_username}}"
+    password: "{{var_synapse_database_data_postgresql_password}}"
     cp_min: 5
     cp_max: 10
 {% endif %}