From 3bc6f9ec98ca3923de065691693b903c3caa6d78 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Tue, 25 Feb 2025 22:51:34 +0100 Subject: [PATCH] Added support for ProxMoxToolKitAppUpdate, fixed isues in hass confiig Hass ct config home dir and ping intergration --- CT-Build/Alpine.yaml | 9 +++++++++ CT-Build/Debian.yaml | 8 ++++++++ CT-Build/Fedora.yaml | 10 +++++++++- CT-Files/hass/Scripts/Init.sh | 5 +++-- CT-Files/hass/Scripts/UpdateHASS.sh | 2 +- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index 7f4a2e2..3aa0d25 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -307,5 +307,14 @@ actions: echo "Europe/Amsterdam" > /etc/timezone ln -s /usr/share/zoneinfo/Europe/Amsterdam /etc/localtime + +#Move App update script for ProxmoxHelper/ProxMoxToolKit, if CT has this script +- trigger: post-files + action: |- + #!/bin/sh + if test -f /opt/Setup/Scripts/PTKAppUpdate.sh ; then + mv /opt/Setup/Scripts/PTKAppUpdate.sh /opt/ProxMoxToolKitAppUpdate.sh + fi + mappings: architecture_map: alpinelinux diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index a16d7b6..45f9364 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -177,5 +177,13 @@ actions: # Cleanup temporary shadow paths rm /etc/*- +#Move App update script for ProxmoxHelper/ProxMoxToolKit, if CT has this script +- trigger: post-files + action: |- + #!/bin/sh + if test -f /opt/Setup/Scripts/PTKAppUpdate.sh ; then + mv /opt/Setup/Scripts/PTKAppUpdate.sh /opt/ProxMoxToolKitAppUpdate.sh + fi + mappings: architecture_map: debian diff --git a/CT-Build/Fedora.yaml b/CT-Build/Fedora.yaml index b557d3a..33348fd 100644 --- a/CT-Build/Fedora.yaml +++ b/CT-Build/Fedora.yaml @@ -199,4 +199,12 @@ actions: bash /opt/Setup/Scripts/Init.sh || exit 1 rm /opt/Setup/Scripts/Init.sh variants: - - hass \ No newline at end of file + - hass + +#Move App update script for ProxmoxHelper/ProxMoxToolKit, if CT has this script +- trigger: post-files + action: |- + #!/bin/sh + if test -f /opt/Setup/Scripts/PTKAppUpdate.sh ; then + mv /opt/Setup/Scripts/PTKAppUpdate.sh /opt/ProxMoxToolKitAppUpdate.sh + fi \ No newline at end of file diff --git a/CT-Files/hass/Scripts/Init.sh b/CT-Files/hass/Scripts/Init.sh index 2df0890..ade38ee 100644 --- a/CT-Files/hass/Scripts/Init.sh +++ b/CT-Files/hass/Scripts/Init.sh @@ -3,7 +3,7 @@ mkdir -p /opt/HomeAssistant/srv mkdir -p /opt/HomeAssistant/data/custom_components/hacs touch /opt/HomeAssistant/data/home-assistant.log -adduser --system --shell /bin/sh --home /opt/HomeAssistant/data hass +adduser --system --shell /bin/sh --home /opt/HomeAssistant hass chown -R hass:hass /opt/HomeAssistant su hass -c 'python3 -m venv /opt/HomeAssistant/srv' @@ -22,4 +22,5 @@ rm -rf /usr/lib/python3.13/__pycache__/* #Setup HomeAssistant service mv /opt/Setup/Configs/hass.service /etc/systemd/system/hass.service -systemctl enable hass \ No newline at end of file +systemctl enable hass +setcap cap_net_raw+p /bin/ping \ No newline at end of file diff --git a/CT-Files/hass/Scripts/UpdateHASS.sh b/CT-Files/hass/Scripts/UpdateHASS.sh index e7b1ea7..c2b8c8e 100644 --- a/CT-Files/hass/Scripts/UpdateHASS.sh +++ b/CT-Files/hass/Scripts/UpdateHASS.sh @@ -1,4 +1,4 @@ #!/bin/bash systemctl stop hass sudo -u hass sh -c '. /opt/HomeAssistant/srv/bin/activate && pip install --upgrade pip && pip3 install --upgrade homeassistant' -service start hass \ No newline at end of file +systemctl start hass