From 4d0585b02e1a5daf9d695bc054b0eff2fb0086fc Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 31 Oct 2025 21:54:25 +0100
Subject: [PATCH] CT  jenkins, x2go,pihole: Fixes for Debian 13 jenkins: Added
 missing packages  &  Fixed broken curl for getting current version  of GoLang
 pihole: will now run a Gravity update on first setup,  to avoid errors  in
 the webUI Readme  fixes for: collabora, domoticz & docker

---
 CT-Build/Debian.yaml                 | 3 +++
 CT-Files/jenkins/Scripts/FirstRun.sh | 2 +-
 CT-Files/pihole/Scripts/FirstRun.sh  | 3 ++-
 Readme.md                            | 7 ++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml
index a301e34..12199e0 100644
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -1321,6 +1321,8 @@ packages:
     - jenkins
     - gcc
     - libc-dev   
+    - libharfbuzz0b
+    - fontconfig
     action: install
     variants:
     - jenkins
@@ -1447,6 +1449,7 @@ packages:
 #X2go pkgs    
   - packages:
     - gnome-themes-extra
+    - tango-icon-theme
     - xfce4-session
     - xfce4-settings
     - xfce4-panel
diff --git a/CT-Files/jenkins/Scripts/FirstRun.sh b/CT-Files/jenkins/Scripts/FirstRun.sh
index cac6114..ca33203 100644
--- a/CT-Files/jenkins/Scripts/FirstRun.sh
+++ b/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 -Ls https://go.dev/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 | head  -n1 | 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
diff --git a/CT-Files/pihole/Scripts/FirstRun.sh b/CT-Files/pihole/Scripts/FirstRun.sh
index cc1e6a8..c873781 100644
--- a/CT-Files/pihole/Scripts/FirstRun.sh
+++ b/CT-Files/pihole/Scripts/FirstRun.sh
@@ -13,5 +13,6 @@ done
 sed -i "/upstreams = \[/,/\]/c\upstreams = [ \"$UpStreamDNS1\" , \"$UpStreamDNS2\" ]" /etc/pihole/pihole.toml
 #Finialize instaltation
 /etc/.pihole/automated\ install/basic-install.sh --reconfigure --unattended
+pihole updateGravity
 #Set password
-pihole setpassword
\ No newline at end of file
+pihole setpassword
diff --git a/Readme.md b/Readme.md
index 16fa0a0..7034255 100644
--- a/Readme.md
+++ b/Readme.md
@@ -99,13 +99,17 @@ Then select the created credential and click save
 * Run the FistRun script  in the container `bash /opt/Setup/Scripts/FirstRun.sh`
 
 ## collabora
-* Update the configuration in /etc/coolwsd/coolwsd.xml and reload the service `systemctl restart coolwsd`
+1. Enable container feature: Nesting
+2. Update the configuration `/etc/coolwsd/coolwsd.xml` (make sure to disable SSL since it tries to use a non existent ssl cert, set the `<enable` option below `<ssl desc="SSL settings">` to `false`)
+3. Restart the service `systemctl restart coolwsd`
 
 ## jellyfin 
 * To set-up the system follow the initial  set-up wizard on http://`<ip>`:8096
 
 ## domoticz
 * Available on http://`<ip>`:8080
+* Default username: admin
+* Default password :domoticz
 
 ## transfersh
 * Available on http://`<ip>`:8080
@@ -115,6 +119,7 @@ Then select the created credential and click save
 * To set-up the system follow the initial  set-up wizard on http://`<ip>`:8088
 
 ## docker
+* Enable container feature: Nesting
 * Run the FistRun script  in the container `bash /opt/Setup/Scripts/FirstRun.sh`
 This container can be set up in two ways
 1. As controller with portainer