[matrix] Gardening

host_vars/trinity.adm.crans.org.yml

@@ -2,3 +2,10 @@
 interfaces:
   adm: ens18
   srv_nat: ens19
+
+loc_matrix_synapse:
+  database:
+    user: synapse
+    password: "{{ vault.matrix_synapse.password }}"
+    name: synapse
+    host: 172.16.10.1

plays/matrix.yml

@@ -1,5 +1,7 @@
 #!/usr/bin/env ansible-playbook
 ---
 - hosts: trinity.adm.crans.org
+  vars:
+    matrix_synapse: "{{ glob_matrix_synapse | default({}) | combine(loc_matrix_synapse | default({})) }}"
   roles:
     - matrix-synapse

roles/matrix-synapse/templates/matrix-synapse/conf.d/database.yaml.j2

@@ -1,9 +1,9 @@
 database:
   name: "psycopg2"
   args:
-    user: "{{ matrix_synapse.database_user }}"
-    password: "{{ matrix_synapse.database_password }}"
-    database: "{{ matrix_synapse.database_name }}"
-    host: "{{ matrix_synapse.database_host }}"
+    user: "{{ matrix_synapse.database.user }}"
+    password: "{{ matrix_synapse.database.password }}"
+    database: "{{ matrix_synapse.database.name }}"
+    host: "{{ matrix_synapse.database.host }}"
     cp_min: 5
     cp_max: 10