Update keycloak and variables

group_vars/all

@@ -229,7 +229,8 @@ gitlab_version:                   "latest"
 joomla_version:                   "latest"
 
 #### Keycloak
-keycloak_version:                 "latest"
+keycloak_version:                   "latest"
+keycloak_administrator_username:    "{{administrator_username}}"
 
 #### Listmonk
 listmonk_admin_username:          "admin"
@@ -247,12 +248,12 @@ mastodon_version:                 "latest"
 mastodon_single_user_mode:        false
 
 #### Matrix
-matrix_admin_name:      "{{administrator_username}}"  # Accountname of the matrix admin
+matrix_administrator_username:  "{{administrator_username}}"  # Accountname of the matrix admin
-matrix_playbook_tags:   "setup-all,start"             # For the initial update use: install-all,ensure-matrix-users-created,start
+matrix_playbook_tags:           "setup-all,start"             # For the initial update use: install-all,ensure-matrix-users-created,start
-matrix_role:            "compose"                     # Role to setup Matrix. Valid values: ansible, compose
+matrix_role:                    "compose"                     # Role to setup Matrix. Valid values: ansible, compose
-matrix_server_name:     "{{top_domain}}"              # Adress for the account names etc.
+matrix_server_name:             "{{top_domain}}"              # Adress for the account names etc.
-matrix_synapse_version: "latest"
+matrix_synapse_version:         "latest"
-matrix_element_version: "latest"
+matrix_element_version:         "latest"
 
 #### Mailu
 mailu_version:          "2024.06"
@@ -280,11 +281,11 @@ pixelfed_version:       "latest"
 
 #### Postgres
 # Please set an version in your inventory file - Rolling release for postgres isn't recommended
-postgres_database_version:      "latest"
+postgres_database_version:  "latest"
 
 #### Taiga
-taiga_version:          "latest"
+taiga_version:              "latest"
 
 #### YOURLS
-yourls_administrator_name:  "{{administrator_username}}"
+yourls_administrator_username:  "{{administrator_username}}"
-yourls_version:             "latest"
+yourls_version:                 "latest"

inventory.example.yml

@@ -45,7 +45,7 @@ pixelfed_database_password:         "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 pixelfed_app_key:                   "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 wordpress_database_password:        "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 yourls_database_password:           "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
-yourls_administrator_name_password:               "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
+yourls_administrator_username_password:               "I_NEED_TO_CHANGE_THIS_UNSECURE_PASSWORD"
 
 path_mass_storage:                  "/mnt/hdd/"
 path_rapid_storage:                 "/mnt/ssd/"

roles/docker-keycloak/tasks/main.yml

@@ -0,0 +1,10 @@
+---
+- name: "include docker/compose/database.yml"
+  include_tasks: docker/compose/database.yml
+
+- name: "include tasks nginx-docker-proxy-domain.yml"
+  include_tasks: nginx-docker-proxy-domain.yml
+
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
+  notify: docker compose project setup

roles/docker-keycloak/templates/docker-compose.yml.j2

@@ -10,7 +10,7 @@ services:
     command: start
     environment:
       KC_HOSTNAME:                    {{domain}}
-      #KC_HOSTNAME_PORT:               {{http_port}}
+      #KC_HOSTNAME_PORT:              {{http_port}}
       KC_HOSTNAME_STRICT_BACKCHANNEL: true
       KC_HTTP_ENABLED:                false
       KC_HOSTNAME_STRICT_HTTPS:       true

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

@@ -131,7 +131,7 @@
 
 - name: create admin account
   command:
-    cmd: docker compose exec -it synapse register_new_matrix_user -u {{matrix_admin_name}} -p {{matrix_admin_password}} -a -c /data/homeserver.yaml http://localhost:8008
+    cmd: docker compose exec -it synapse register_new_matrix_user -u {{matrix_administrator_username}} -p {{matrix_admin_password}} -a -c /data/homeserver.yaml http://localhost:8008
     chdir: "{{ docker_compose_instance_directory }}"
   ignore_errors: true
   when: mode_setup | bool

roles/docker-matrix-compose/templates/docker-compose.yml.j2

@@ -33,7 +33,7 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
     
   element:
-    image: vectorim/element-web:{{matrix_synapse_element}}
+    image: vectorim/element-web:{{matrix_element_version}}
     container_name: matrix-element
     restart: {{docker_restart_policy}}
     volumes:

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

@@ -381,7 +381,7 @@ bridge:
     permissions:
         "*": relay
         "{{matrix_server_name}}": user
-        "@{{matrix_admin_name}}:{{matrix_server_name}}": admin
+        "@{{matrix_administrator_username}}:{{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
         "{{matrix_server_name}}": user
-        "@{{matrix_admin_name}}:{{matrix_server_name}}": admin
+        "@{{matrix_administrator_username}}:{{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
         "{{matrix_server_name}}": user
-        "@{{matrix_admin_name}}:{{matrix_server_name}}": admin
+        "@{{matrix_administrator_username}}:{{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
         "{{matrix_server_name}}": user
-        "@{{matrix_admin_name}}:{{matrix_server_name}}": admin
+        "@{{matrix_administrator_username}}:{{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.{{matrix_server_name}}": "user"
         "{{matrix_server_name}}": "full"
-        "@{{matrix_admin_name}}:{{matrix_server_name}}": "admin"
+        "@{{matrix_administrator_username}}:{{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
         "{{matrix_server_name}}": user
-        "@{{matrix_admin_name}}:{{matrix_server_name}}": admin
+        "@{{matrix_administrator_username}}:{{matrix_server_name}}": admin
     
     # Settings for relay mode
     relay:

roles/docker-yourls/templates/docker-compose.yml.j2

@@ -15,8 +15,8 @@ services:
       YOURLS_DB_PASS: "{{database_password}}"
       YOURLS_DB_NAME: "{{database_name}}"
       YOURLS_SITE: "https://{{domain}}"
-      yourls_administrator_name: "{{yourls_administrator_name}}"
+      yourls_administrator_username: "{{yourls_administrator_username}}"
-      YOURLS_PASS: "{{yourls_administrator_name_password}}"
+      YOURLS_PASS: "{{yourls_administrator_username_password}}"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1/admin/"]
       interval: 1m