From 1c6ec8f73cd30b5a655b11c4bf4c99bf789dc500 Mon Sep 17 00:00:00 2001
From: Thorsten Spille <thorsten@bashclub.org>
Date: Sat, 17 Jan 2026 17:15:54 +0000
Subject: [PATCH] Debian 13 for nextcloud and semaphore

---
 src/ansible-semaphore/constants-service.conf | 2 +-
 src/ansible-semaphore/install-service.sh     | 7 ++-----
 src/functions.sh                             | 8 ++++++--
 src/nextcloud/constants-service.conf         | 4 ++--
 src/nextcloud/install-service.sh             | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/ansible-semaphore/constants-service.conf b/src/ansible-semaphore/constants-service.conf
index 9204cd7..1f75517 100644
--- a/src/ansible-semaphore/constants-service.conf
+++ b/src/ansible-semaphore/constants-service.conf
@@ -8,7 +8,7 @@
 # This file contains the project constants on service level
 
 # Debian Version, which will be installed
-LXC_TEMPLATE_VERSION="debian-12-standard"
+LXC_TEMPLATE_VERSION="debian-13-standard"
 
 # Create sharefs mountpoint
 LXC_MP=0
diff --git a/src/ansible-semaphore/install-service.sh b/src/ansible-semaphore/install-service.sh
index 09b743a..a9dc2ca 100644
--- a/src/ansible-semaphore/install-service.sh
+++ b/src/ansible-semaphore/install-service.sh
@@ -9,11 +9,8 @@ source /root/functions.sh
 source /root/zamba.conf
 source /root/constants-service.conf
 
-wget -q -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/nginx.key >/dev/null
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/nginx.key] http://nginx.org/packages/debian $(lsb_release -cs) nginx" | tee /etc/apt/sources.list.d/nginx.list
-
-wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc  | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/postgresql.key >/dev/null
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/postgresql.key] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
+inst_nginx
+inst_postgresql
 
 apt update
 
diff --git a/src/functions.sh b/src/functions.sh
index dfe52bb..0f41c41 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -76,14 +76,18 @@ inst_nginx() {
 
 #### Set repo and install PHP ####
 inst_php() {
+    PHP_MODULES=${1}
+    PHP_VERSION=${2:-8.5}
     apt_repo "php" "https://packages.sury.org/php/apt.gpg" "https://packages.sury.org/php/" "$(lsb_release -sc)" "main"
-    apt update && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq --no-install-recommends php-common php$NEXTCLOUD_PHP_VERSION-{fpm,gd,curl,pgsql,xml,zip,intl,mbstring,bz2,ldap,apcu,bcmath,gmp,imagick,igbinary,mysql,redis,smbclient,sqlite3,cli,common,opcache,readline}
+    apt update && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq --no-install-recommends php-common php${PHP_VERSION}-${PHP_MODULES}
 }
 
 #### Set repo and install Postgresql ####
+# First paramater is postgres version, default ist curren version postgres 18
 inst_postgresql() {
+    POSTGRES_VERSION=${1:-18}
     apt_repo "postgresql" "https://www.postgresql.org/media/keys/ACCC4CF8.asc" "http://apt.postgresql.org/pub/repos/apt" "$(lsb_release -cs)-pgdg" "main"
-    apt update && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq --no-install-recommends postgresql-$POSTGRES_VERSION
+    apt update && DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq --no-install-recommends postgresql-${POSTGRES_VERSION}
 }
 
 #### Set repo and install Crowdsec ####
diff --git a/src/nextcloud/constants-service.conf b/src/nextcloud/constants-service.conf
index e4665e2..3f7932d 100644
--- a/src/nextcloud/constants-service.conf
+++ b/src/nextcloud/constants-service.conf
@@ -8,7 +8,7 @@
 # This file contains the project constants on service level
 
 # Debian Version, which will be installed
-LXC_TEMPLATE_VERSION="debian-12-standard"
+LXC_TEMPLATE_VERSION="debian-13-standard"
 
 # Create sharefs mountpoint
 LXC_MP=1
@@ -33,7 +33,7 @@ NEXTCLOUD_VERSION="latest"
 NEXTCLOUD_PHP_VERSION="8.3"
 
 # Defines the postgresql version to install
-POSTGRES_VERSION=16 
+POSTGRES_VERSION=18
 
 # Defines the IP from the SQL server
 NEXTCLOUD_DB_IP="127.0.0.1"
diff --git a/src/nextcloud/install-service.sh b/src/nextcloud/install-service.sh
index 8e50e50..fe4df18 100644
--- a/src/nextcloud/install-service.sh
+++ b/src/nextcloud/install-service.sh
@@ -549,7 +549,7 @@ echo "=> Modifying Nginx config for Nextcloud ..."
 mod_nginx
 
 echo "=> Installing PHP $NEXTCLOUD_PHP_VERSION ..."
-inst_php
+inst_php {fpm,gd,curl,pgsql,xml,zip,intl,mbstring,bz2,ldap,apcu,bcmath,gmp,imagick,igbinary,mysql,redis,smbclient,sqlite3,cli,common,opcache,readline} $NEXTCLOUD_PHP_VERSION
 echo "=> Modifying PHP config for Nextcloud ..."
 mod_php