roles/docker-matrix-ansible/README.md

@@ -8,13 +8,5 @@ Matrix is an open-source project that provides a protocol for secure, decentrali
 
 This software uses https://github.com/spantaleev/matrix-docker-ansible-deploy as a base. 
 
-## DANGER: Manuell deativation and deletion
-Be carefull what you do. This code you can execute:
-```
-systemctl list-units --type=service | grep 'matrix' | awk '{print $1}' | xargs -I {} systemctl disable {} &&
-systemctl list-units --type=service | grep 'matrix' | awk '{print $1}' | xargs -I {} systemctl stop {} &&
-rm -rv /matrix/
-```
-
 ##  Alternativ Matrix Setup Role
 An alternativ role to deploy Matrix you will find [here](../docker-matrix-compose/)

roles/docker-matrix-compose/tasks/main.yml

@@ -17,17 +17,17 @@
     state: directory
     mode: 0755
 
-#- name: "create {{docker_compose_instance_directory}}mautrix_whatsapp"
-#  file:
-#    path: "{{docker_compose_instance_directory}}mautrix_whatsapp"
-#    state: directory
-#    mode: 0755
-#
-#- name: add whatsapp-bridge-config.yml
-#  template: 
-#    src:  "whatsapp-bridge-config.yml.j2" 
-#    dest: "{{docker_compose_instance_directory}}mautrix_whatsapp/config.yml"
-#  notify: recreate matrix
+- name: "create {{docker_compose_instance_directory}}mautrix_whatsapp"
+  file:
+    path: "{{docker_compose_instance_directory}}mautrix_whatsapp"
+    state: directory
+    mode: 0755
+
+- name: add whatsapp-bridge-config.yml
+  template: 
+    src:  "whatsapp-bridge-config.yml.j2" 
+    dest: "{{docker_compose_instance_directory}}mautrix_whatsapp/config.yml"
+  notify: recreate matrix
 
 - name: add element-config.json
   template: 

roles/docker-matrix-compose/templates/homeserver.yaml.j2

@@ -12,7 +12,7 @@ database:
   name: psycopg2
   args:
     user: matrix
-    password: "{{matrix_database_password}}"
+    password: {{matrix_database_password}}
     database: matrix
     host: database
     cp_min: 5

roles/docker-matrix-compose/templates/whatsapp-bridge-config.yml.j2

@@ -3,7 +3,7 @@ homeserver:
     # The address that this appservice can use to connect to the homeserver.
     address: https://{{synapse_domain}}
     # The domain of the homeserver (for MXIDs, etc).
-    domain: "{{synapse_domain}}"
+    domain: {{synapse_domain}}
     
     # What software is the homeserver running?
     # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.

servers.yml

@@ -204,7 +204,6 @@
   become: true
   roles:
    -  role: docker-matrix-ansible
-      when: matrix_role == 'ansible'
       vars:
         domains:
           - "{{domain_matrix_element}}"
@@ -212,13 +211,14 @@
         element_domain:   "{{domain_matrix_element}}"
         synapse_domain:   "{{domain_matrix_synapse}}"
         http_port: 8021
+        when: matrix_role == 'ansible'
    -  role: docker-matrix-compose
-      when: matrix_role == 'compose'
       vars:
         element_domain:   "{{domain_matrix_element}}"
         synapse_domain:   "{{domain_matrix_synapse}}"
         synapse_http_port: 8021
         element_http_port: 8022
+        when: matrix_role == 'compose'
 
 - name: setup open project instances
   hosts: openproject