Optimized Nextcloud for OIDC flavor login and adapted user administrator credentials

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

@@ -134,7 +134,7 @@
 
 - name: create admin account
   command:
-    cmd: docker compose exec -it synapse register_new_matrix_user -u {{applications.matrix.administrator_username}} -p {{matrix_admin_password}} -a -c /data/homeserver.yaml http://localhost:8008
+    cmd: docker compose exec -it synapse register_new_matrix_user -u {{applications.matrix.users.administrator.username}} -p {{matrix_admin_password}} -a -c /data/homeserver.yaml http://localhost:8008
     chdir: "{{ docker_compose.directories.instance }}"
   ignore_errors: true
   when: applications.matrix.setup | bool

roles/docker-matrix-compose/templates/mautrix/facebook.config.yml.j2

@@ -381,7 +381,7 @@ bridge:
     permissions:
         "*": relay
         "{{applications.matrix.server_name}}": user
-        "@{{applications.matrix.administrator_username}}:{{applications.matrix.server_name}}": admin
+        "@{{applications.matrix.users.administrator.username}}:{{applications.matrix.server_name}}": admin
 
     relay:
         # Whether relay mode should be allowed. If allowed, `!fb set-relay` can be used to turn any

roles/docker-matrix-compose/templates/mautrix/instagram.config.yml.j2

@@ -360,7 +360,7 @@ bridge:
     permissions:
         "*": relay
         "{{applications.matrix.server_name}}": user
-        "@{{applications.matrix.administrator_username}}:{{applications.matrix.server_name}}": admin
+        "@{{applications.matrix.users.administrator.username}}:{{applications.matrix.server_name}}": admin
 
     relay:
         # Whether relay mode should be allowed. If allowed, `!ig set-relay` can be used to turn any

roles/docker-matrix-compose/templates/mautrix/signal.config.yml.j2

@@ -275,7 +275,7 @@ bridge:
     permissions:
         "*": relay
         "{{applications.matrix.server_name}}": user
-        "@{{applications.matrix.administrator_username}}:{{applications.matrix.server_name}}": admin
+        "@{{applications.matrix.users.administrator.username}}:{{applications.matrix.server_name}}": admin
 
     # Settings for relay mode
     relay:

roles/docker-matrix-compose/templates/mautrix/slack.config.yml.j2

@@ -279,7 +279,7 @@ bridge:
     permissions:
         "*": relay
         "{{applications.matrix.server_name}}": user
-        "@{{applications.matrix.administrator_username}}:{{applications.matrix.server_name}}": admin
+        "@{{applications.matrix.users.administrator.username}}:{{applications.matrix.server_name}}": admin
 
 # Logging config. See https://github.com/tulir/zeroconfig for details.
 logging:

roles/docker-matrix-compose/templates/mautrix/telegram.config.yml.j2

@@ -532,7 +532,7 @@ bridge:
         "*": "relaybot"
         "public.{{applications.matrix.server_name}}": "user"
         "{{applications.matrix.server_name}}": "full"
-        "@{{applications.matrix.administrator_username}}:{{applications.matrix.server_name}}": "admin"
+        "@{{applications.matrix.users.administrator.username}}:{{applications.matrix.server_name}}": "admin"
 
     # Options related to the message relay Telegram bot.
     relaybot:

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

@@ -435,7 +435,7 @@ bridge:
     permissions:
         "*": relay
         "{{applications.matrix.server_name}}": user
-        "@{{applications.matrix.administrator_username}}:{{applications.matrix.server_name}}": admin
+        "@{{applications.matrix.users.administrator.username}}:{{applications.matrix.server_name}}": admin
     
     # Settings for relay mode
     relay:

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

@@ -28,7 +28,7 @@ web_client_location:            "https://{{domains.matrix_element}}"
 public_baseurl:                 "https://{{domains.matrix_synapse}}"
 trusted_key_servers:
   - server_name: "matrix.org"
-admin_contact: 'mailto:{{administrator_email}}'
+admin_contact: 'mailto:{{users.administrator.email}}'
 
 email:
   smtp_host:                    "{{system_email.host}}"