Merge branch 'main' of https://git.bprieshof.nl/brammp/HomeServerCTs into main

CT-Build/Alpine.yaml

@@ -670,6 +670,14 @@ actions:
   - heimdall
   - vouchproxy
 
+#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
+
 # Enable service for iscsi CT
 - trigger: post-files
   action: |-

CT-Build/Debian.yaml

@@ -1462,6 +1462,15 @@ actions:
   - nfs
   - duplicati
 
+#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
+
+#Setup jenkins user for node CT
 - trigger: post-packages
   action: |-
     #!/bin/sh

CT-Files/docker/Scripts/FirstRun.sh

@@ -6,13 +6,14 @@ while true; do
         [Cc]* )
         docker pull portainer/portainer-ce
         docker run -d -p 9000:9000 --name=Portainer --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v /srv/portainer:/data portainer/portainer-ce
+        mv /opt/Setup/Scripts/PTKPortainerUpdate.sh /opt/ProxMoxToolKitAppUpdate.sh
         mv /opt/Setup/Scripts/UpdatePortainer.sh /root/UpdatePortainer.sh
         echo "Portainer avalible on http://<ip>:9000"
         break;;
         [Rr]* )
         mkdir -p /etc/systemd/system/docker.service.d
         mv /opt/Setup/Configs/remote-dockerOverwrite.service /etc/systemd/system/docker.service.d/startup_options.conf
-        rm /opt/Setup/Scripts/UpdatePortainer.sh
+        rm /opt/Setup/Scripts/UpdatePortainer.sh /opt/Setup/Scripts/PTKPortainerUpdate.sh
         systemctl daemon-reload
         systemctl restart docker.service
         echo "DockerTCP Socket avalible on port 2375"

CT-Files/docker/Scripts/PTKPortainerUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+bash /root/UpdatePortainer.sh

CT-Files/duplicati/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+bash /opt/UpdateDuplicati.sh

CT-Files/elkarbackupALP/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+ash /opt/updateElkarbackup.sh

CT-Files/gitea/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+ash /opt/UpdateGitea.sh

CT-Files/hass/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+ash /opt/UpdateHASS.sh

CT-Files/jenkins/Scripts/FirstRun.sh

@@ -27,7 +27,7 @@ InstalledPlugins=$(java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -web
 #Update configuratiopn before putting them in place
 sed -i -e 's/LocaleVersion/'$(printf "%s" "${InstalledPlugins%x}" | grep '^locale ' | awk '{ print $NF}')'/g' /opt/Setup/Configs/locale.xml
 sed -i -e 's/DarkThemeVersion/'$(printf "%s" "${InstalledPlugins%x}" | grep '^dark-theme ' | awk '{ print $NF}')'/g' -e 's/ThemeManagerVersion/'$(printf "%s" "${InstalledPlugins%x}" | grep '^theme-manager ' | awk '{ print $NF}')'/g' /opt/Setup/Configs/io.jenkins.plugins.thememanager.ThemeManagerPageDecorator.xml
-sed -i -e 's/GoPluginVersion/'$(printf "%s" "${InstalledPlugins%x}" | grep '^golang ' | awk '{ print $NF}')'/g' -e 's/GoVersion/'$(curl -s https://golang.org/VERSION?m=text |sed 's/go//g')'/g' /opt/Setup/Configs/org.jenkinsci.plugins.golang.GolangBuildWrapper.xml
+sed -i -e 's/GoPluginVersion/'$(printf "%s" "${InstalledPlugins%x}" | grep '^golang ' | awk '{ print $NF}')'/g' -e 's/GoVersion/'$(curl -Ls https://go.dev/VERSION?m=text |sed 's/go//g')'/g' /opt/Setup/Configs/org.jenkinsci.plugins.golang.GolangBuildWrapper.xml
 mv -t /var/lib/jenkins /opt/Setup/Configs/locale.xml /opt/Setup/Configs/io.jenkins.plugins.thememanager.ThemeManagerPageDecorator.xml /opt/Setup/Configs/org.jenkinsci.plugins.golang.GolangBuildWrapper.xml 
 
 #Restart

CT-Files/mysql/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+bash /opt/UpdatePhpMyadmin.sh

CT-Files/nextcloud/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+sudo -u nginx php8 /opt/nextcloud/updater/updater.phar --no-interaction

CT-Files/nodered/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+ash /opt/Update-NodeRed.sh

CT-Files/pihole/Scripts/PTKPortainerUpdate.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+/usr/local/bin/pihole -up

CT-Files/z2mqtt/Scripts/PTKAppUpdate.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
+ash /opt/Update-Zigbee2Mqtt.sh
+ash /opt/Update-Zwave2Mqtt.sh