From bb57fd1558008679e96addd92aea6d5d2e1ab6e0 Mon Sep 17 00:00:00 2001 From: Stefan Ostermann Date: Sat, 3 May 2025 11:22:07 +0000 Subject: [PATCH] progress --- ai/docker-compose.yml | 2 +- hass/docker-compose.yml | 4 ++-- hass/homeassistant/.HA_VERSION | 2 +- hass/homeassistant/automations.yaml | 2 +- hass/homeassistant/shell_commands.yaml | 2 +- hass/zb2mqttdata/configuration.yaml | 12 +++++++----- samba/docker-compose.yml | 6 +++++- wikimd/wiki/homepage.md | 4 ++++ 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ai/docker-compose.yml b/ai/docker-compose.yml index 8c5e637..c8a37df 100644 --- a/ai/docker-compose.yml +++ b/ai/docker-compose.yml @@ -1,6 +1,6 @@ services: openwebui: - image: ghcr.io/open-webui/open-webui:0.5.20 + image: ghcr.io/open-webui/open-webui:0.6.5 container_name: open-webui restart: always environment: diff --git a/hass/docker-compose.yml b/hass/docker-compose.yml index 94471fb..df6a469 100644 --- a/hass/docker-compose.yml +++ b/hass/docker-compose.yml @@ -19,7 +19,7 @@ services: homeassistant: container_name: homeassistant - image: homeassistant/home-assistant:2025.3.1 + image: homeassistant/home-assistant:2025.4.4 volumes: - ./homeassistant:/config - /etc/localtime:/etc/localtime:ro @@ -58,6 +58,6 @@ services: - /run/udev:/run/udev:ro environment: - TZ=Europe/Amsterdam - image: koenkk/zigbee2mqtt:2.1.3 + image: koenkk/zigbee2mqtt:2.3.0 links: - "mqtt:mqtt" diff --git a/hass/homeassistant/.HA_VERSION b/hass/homeassistant/.HA_VERSION index c50e97c..d6ab4ed 100644 --- a/hass/homeassistant/.HA_VERSION +++ b/hass/homeassistant/.HA_VERSION @@ -1 +1 @@ -2025.1.4 \ No newline at end of file +2025.4.4 \ No newline at end of file diff --git a/hass/homeassistant/automations.yaml b/hass/homeassistant/automations.yaml index 441d7cf..66dd2bd 100644 --- a/hass/homeassistant/automations.yaml +++ b/hass/homeassistant/automations.yaml @@ -519,7 +519,7 @@ entity_id: 47503c95c474e4f8bfba5f00c725a1d4 domain: light - condition: time - after: 05:00:00 + after: 06:12:00 before: 08:30:00 actions: - action: light.turn_on diff --git a/hass/homeassistant/shell_commands.yaml b/hass/homeassistant/shell_commands.yaml index 066e1cc..0750f1c 100644 --- a/hass/homeassistant/shell_commands.yaml +++ b/hass/homeassistant/shell_commands.yaml @@ -1,3 +1,3 @@ turn_off_remote_pc: "ssh -i /config/ssh_keys/id_rsa_homeassistant -o 'StrictHostKeyChecking=no' homeassistant@192.168.178.87 sudo shutdown -h now" -start_comfy_ui: "ssh -i /config/ssh_keys/id_rsa_homeassistant -o 'StrictHostKeyChecking=no' homeassistant@192.168.178.87 bash -c 'cd /home/oster/git/ComfyUI;./start.sh; read x'" +start_comfy_ui: "ssh -i /config/ssh_keys/id_rsa_homeassistant -o 'StrictHostKeyChecking=no' homeassistant@192.168.178.87 'cd /opt/ComfyUI;./start-remote.sh'" stop_comfy_ui: "echo 0" diff --git a/hass/zb2mqttdata/configuration.yaml b/hass/zb2mqttdata/configuration.yaml index 211ec2a..394367b 100644 --- a/hass/zb2mqttdata/configuration.yaml +++ b/hass/zb2mqttdata/configuration.yaml @@ -22,13 +22,11 @@ devices: '0xf0d1b800001ffcf2': friendly_name: Bogenlampe '0xa4c138570b1956d9': - friendly_name: '0xa4c138570b1956d9' + friendly_name: Temperatur Hannas Zimmer '0xa4c1383ec7aa7d95': - friendly_name: '0xa4c1383ec7aa7d95' + friendly_name: Temperatur Küche '0xa4c1383db5531833': - friendly_name: '0xa4c1383db5531833' - '0x000d6f00109eb214': - friendly_name: Fernbedienung + friendly_name: Temperatur Bad '0x00212effff0cb8b6': friendly_name: Lichtschlauch '0x0ceff6fffebf4739': @@ -63,6 +61,10 @@ devices: friendly_name: Medienschrank Wohnzimmer '0x000d6f001417c16e': friendly_name: Fernbedienung Keller + '0xa4c138066bf1f4c7': + friendly_name: Wasser Sensor Bad + '0x000d6f00109eb214': + friendly_name: Fernbedienung homeassistant: enabled: true version: 4 diff --git a/samba/docker-compose.yml b/samba/docker-compose.yml index 5cde4e2..7db93da 100644 --- a/samba/docker-compose.yml +++ b/samba/docker-compose.yml @@ -34,22 +34,25 @@ services: #ACCOUNT_oster: "oster:1000:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:86C156FC198B358CCCF6278D8BD49B6A:[U ]:LCT-61B0859A:" ACCOUNT_oster: "oster:1000:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:079B8E33CB77467761A3B505A15D8163:[U ]:LCT-67A885B6:" ACCOUNT_karin: "karin:1001:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:580F67E12940BCE800781B09EA453D4D:[U ]:LCT-67BF7AE3:" + ACCOUNT_test: "test:1002:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:1910BD9285A6B8C9344D9F5CC74E0878:[U ]:LCT-68015D9D:" # example for password hashes in the list format: # - "ACCOUNT_foo=foo:1000:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:8846F7EAEE8FB117AD06BDD830B7586C:[U ]:LCT-5FE1F7DF:" UID_oster: 1000 UID_karin: 1001 + UID_test: 1002 GROUPS_oster: family GROUPS_karin: family SAMBA_VOLUME_CONFIG_oster: "[oster]; path=/shares/oster; valid users = oster; guest ok = no; read only = no; browseable = yes" SAMBA_VOLUME_CONFIG_karin: "[karin]; path=/shares/karin; valid users = karin; guest ok = no; read only = no; browseable = yes" + SAMBA_VOLUME_CONFIG_test: "[test]; path=/shares/test; valid users = test; guest ok = no; read only = no; browseable = yes" SAMBA_VOLUME_CONFIG_paperless: "[paperless]; path=/shares/paperless-consume; valid users = oster, karin; guest ok = no; read only = no; browseable = yes" SAMBA_VOLUME_CONFIG_public: "[Public]; path=/shares/public; valid users = oster, karin; guest ok = no; read only = no; browseable = yes" SAMBA_VOLUME_CONFIG_public_ro: "[Public ReadOnly]; path=/shares/public; guest ok = yes; read only = yes; browseable = yes" SAMBA_VOLUME_CONFIG_video_ro: "[Video]; path=/shares/video; valid users = oster, karin; guest ok = no; read only = no; browseable = yes" SAMBA_VOLUME_CONFIG_music_ro: "[Music]; path=/shares/music; valid users = oster, karin; guest ok = no; read only = no; browseable = yes" SAMBA_VOLUME_CONFIG_ebooks_ro: "[Ebooks]; path=/shares/ebooks; valid users = oster, karin; guest ok = no; read only = no; browseable = yes" - SAMBA_VOLUME_CONFIG_karinstefan: "[karin stefan]; path=/shares/karin-stefan; valid users = oster, karin; guest ok = no; read only = no; browseable = yes" + SAMBA_VOLUME_CONFIG_karinstefan: "[karin stefan]; path=/shares/karin-stefan; valid users = oster, karin, test; guest ok = no; read only = no; browseable = yes" #SAMBA_VOLUME_CONFIG_guestmultilineexample: | # [Guest Share] # path = /shares/guest @@ -63,6 +66,7 @@ services: - /media/ssd/public:/shares/public - /media/ssd/oster:/shares/oster - /media/ssd/karin:/shares/karin + - /media/ssd/test:/shares/test - /media/ssd/karin-stefan:/shares/karin-stefan - /media/extension/music:/shares/music - /media/extension/video:/shares/video diff --git a/wikimd/wiki/homepage.md b/wikimd/wiki/homepage.md index 68771c5..5f48841 100644 --- a/wikimd/wiki/homepage.md +++ b/wikimd/wiki/homepage.md @@ -13,6 +13,8 @@ [Jellyfin Medien](https://media.home.thoster.net) +[ComfyUI](https://comfy.home.thoster.net) ComfyUI vorher über Home Assistant starten! + --- [KI Server](https://ai.home.thoster.net) @@ -25,6 +27,8 @@ [Nextcloud](https://cloud.thoster.net) >Cloudspeicher, kann auch Videotelefonie, Kalender, Kontakte und vieles mehr! Jetzt auch über zentrale Authentifizierung (Login with Authentik SSO). +>Für die Synchronisierung einer keepass Datei mit der Handy App ist weiterhin ein "normaler" Login notwendig. + ---