From a9d6bda6784f5c7b3d354bb762707a9b9d7db1ad Mon Sep 17 00:00:00 2001 From: lilly Date: Fri, 6 Nov 2026 15:22:52 +0100 Subject: [PATCH] update dooris configuration to allow connection to club-assistant --- inventories/z9/host_vars/dooris.sops.yaml | 5 +++-- inventories/z9/host_vars/dooris.yaml | 1 + roles/dooris/README.md | 2 ++ roles/dooris/meta/argument_specs.yml | 10 ++++++++++ roles/dooris/templates/compose.yaml.j2 | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/inventories/z9/host_vars/dooris.sops.yaml b/inventories/z9/host_vars/dooris.sops.yaml index c5c6d571..0da043f6 100644 --- a/inventories/z9/host_vars/dooris.sops.yaml +++ b/inventories/z9/host_vars/dooris.sops.yaml @@ -1,6 +1,7 @@ dooris__static_api_token: ENC[AES256_GCM,data:pXmjn36FnOwA7fWAd3Go4W1CiMeRbbAiquj9KI/pQEDy1qDuobBbBft25m3uSAo6VI02PW2oZ4koY8uoPDUwNA==,iv:TNaZjwGBHvIbmF7VPIOo5mYzH1NEIyKIgjzkrobNCoI=,tag:4dHZepMxUGcvBYEp0kNwYQ==,type:str] dooris__openid_client_secret: ENC[AES256_GCM,data:PqmtHR6LCGXcK5dyqKihUqU6+lydW0mJf7kMMf41qh4=,iv:ZjIl8jwB2lfJHjwcDEFFCbafMBnpzkccxBvvsjg+ia8=,tag:+eCnr9ojv9uUoO9k5khY6w==,type:str] dooris__ccujack_password: ENC[AES256_GCM,data:FBbrdoQRdVZ+1n8WZg42jZz/xvQ=,iv:GLuen+LiB4MrvU71gEdVYWbdHKaDcEKify3vPePuoO0=,tag:nuqkP0cJLsvNAieWDNY3HA==,type:str] +dooris__home_assistant_mqtt_password: ENC[AES256_GCM,data:4UH9Ay6FChhHFdlyWiTT8HdMYfnBdokB7b9qz2lM8Y0=,iv:BvzRAxQv9bBYSaCotaMpaF5tlPkdpohFHouql6uFUTc=,tag:FGeW4cUXUkNWqHGaHN1BBg==,type:str] dooris__spaceapid_password: ENC[AES256_GCM,data:3MLPzV7NxvOLQSHoBgPdR1WeGGhDZVnxDHDNviPseOQDkFkqUXFGPtfPQqI/pjs0VV607ehw+SfF3T8tMhorgA==,iv:U5j0SmM9rNsQTSxuLSiuG6zyMxVjfdNnu9BPXcaDjko=,tag:glvUmu79iCFEXmGDvm7Vuw==,type:str] dooris__acmedns: subdomain: ENC[AES256_GCM,data:XncJZ7qT51dLSkvfIc0Nc3SFxK1y/ip1cO4HA9CJMFtQy+mP,iv:mgwfx0QMzHadvUDZDYCzsiP1Oh+P/5DekbZ4M6y08t4=,tag:4oyXvAJEOFlw7wrrrhwspQ==,type:str] @@ -38,8 +39,8 @@ sops: kTwfagTspQXYDhukV7gWzavzr1OLpC+hr/NkK40VZlejjRniD8tNGg== -----END AGE ENCRYPTED FILE----- recipient: age1j0876shgsn7f2thxh9kx9x5uwnh45z6sy2jlk2qz5jhgedm26g5srn9kax - lastmodified: "2026-08-11T14:12:13Z" - mac: ENC[AES256_GCM,data:yFvVk8J3Kjf7hYQ5E7tN0Dpa8943n2OLcVKEQWcyMFrl991cYjpti+a766Bx79KgaBqSW70E7Y13KfdXw0wpETte+KwpXEmlh54/3UihdvcavcH0ep7zZhyXEtoBfDTKoFMkvDgmQbljnOOWbWpW0X60lyWe0/xHIHJonlZ7PuY=,iv:9HdGaa4CXKJfI7LgY7oSsLU0VPZZ+dSW+k1s9v5xZkk=,tag:g4BSo09RAslC3H1djw6B2Q==,type:str] + lastmodified: "2026-11-06T14:20:05Z" + mac: ENC[AES256_GCM,data:B5nO8jLpHoYhGCMgJv0LON79XxNY6LdR5AR387OsndQI1Dp5JCQzOB93ieQ72Sr0aoe7dEbJgYDI3/aQyBwFuvkYjX84Zc/5qCm/ovV1tYM14g3kh7cqGy0bdXdJ4J0JgRe6OOS9RT+70GCSa4UE05sRskZkuNMnJ7/mIk9GLgI=,iv:DMmxpcb9otfWzpDeA7/iY90GNckWV4muZ8LTZcMrO+s=,tag:lJtUE2bjNe/PjBAQ1/VS/Q==,type:str] pgp: - created_at: "2026-09-24T19:54:40Z" enc: |- diff --git a/inventories/z9/host_vars/dooris.yaml b/inventories/z9/host_vars/dooris.yaml index 12b750b8..4ec67a60 100644 --- a/inventories/z9/host_vars/dooris.yaml +++ b/inventories/z9/host_vars/dooris.yaml @@ -1,6 +1,7 @@ dooris__hostname: "dooris.ccchh.net" dooris__openid_client_id: "dooris" dooris__ccujack_user: "dooris" +dooris__home_assistant_mqtt_user: "dooris" dooris__spaceapid_user: "dooris" dooris__main_lock: "Hauptraum" diff --git a/roles/dooris/README.md b/roles/dooris/README.md index 6b7efa2a..4e294b39 100644 --- a/roles/dooris/README.md +++ b/roles/dooris/README.md @@ -8,6 +8,8 @@ For an exact description of host requirements, see the README of dooris itself. - `dooris__hostname`: The hostname on which the dooris server is reachable - `dooris__ccujack_user`: Username for authentication against homematic ccujack - `dooris__ccujack_password` Password for authentication against homematic ccujack +- `dooris__home_assistant_mqtt_user` Username for authentication against club-assistant mqtt +- `dooris__home_assistant_mqtt_password` Password for authentication against club-assistant mqtt - `dooris__openid_client_id`: Client-ID in CCCHH ID for dooris - `dooris__openid_client_secret`: Client-Secret in CCCHH ID for dooris - `dooris__static_api_token`: A static token that is valid on the servers API and can operate locks diff --git a/roles/dooris/meta/argument_specs.yml b/roles/dooris/meta/argument_specs.yml index 01f7ea29..04b611e0 100644 --- a/roles/dooris/meta/argument_specs.yml +++ b/roles/dooris/meta/argument_specs.yml @@ -31,6 +31,16 @@ argument_specs: required: true type: str + dooris__home_assistant_mqtt_password: + description: "Password for authentication against Club-Assistant MQTT" + required: true + type: str + + dooris__home_assistant_mqtt_user: + description: "Username for authentication against Club-Assistant MQTT" + required: true + type: str + dooris__spaceapid_user: description: "Username for authentication against out spaceapid" required: true diff --git a/roles/dooris/templates/compose.yaml.j2 b/roles/dooris/templates/compose.yaml.j2 index 2a39b42a..77195685 100644 --- a/roles/dooris/templates/compose.yaml.j2 +++ b/roles/dooris/templates/compose.yaml.j2 @@ -13,6 +13,8 @@ services: DOORIS_STATIC_API_TOKENS: "{{ dooris__static_api_token }}" DOORIS_SPACEAPID_USER: "{{ dooris__spaceapid_user }}" DOORIS_SPACEAPID_PASSWORD: "{{ dooris__spaceapid_password }}" + DOORIS_HOME_ASSISTANT_MQTT_USER: "{{ dooris__home_assistant_mqtt_user }}" + DOORIS_HOME_ASSISTANT_MQTT_PASSWORD: "{{ dooris__home_assistant_mqtt_password }}" DOORIS_MAIN_LOCK: "{{ dooris__main_lock }}" network_mode: host restart: unless-stopped