From fc1ebd479ada38e9eb2794a10703c1ac2bf76faa Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 18 Jan 2026 12:24:10 +0100 Subject: [PATCH] onloyoffice, matrix, urbackup --- src/matrix/constants-service.conf | 2 +- src/matrix/install-service.sh | 19 ++++++++----------- src/onlyoffice/constants-service.conf | 2 +- src/onlyoffice/install-service.sh | 20 ++++++++++---------- src/urbackup/install-service.sh | 2 ++ 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/matrix/constants-service.conf b/src/matrix/constants-service.conf index 57f799e..7cad95f 100644 --- a/src/matrix/constants-service.conf +++ b/src/matrix/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/matrix/install-service.sh b/src/matrix/install-service.sh index 5f141df..35b39c9 100644 --- a/src/matrix/install-service.sh +++ b/src/matrix/install-service.sh @@ -9,6 +9,8 @@ source /root/functions.sh source /root/zamba.conf source /root/constants-service.conf +set -euo pipefail + MRX_PKE=$(random_password) ELE_DBNAME="synapse_db" @@ -17,15 +19,10 @@ ELE_DBPASS=$(random_password) ELE_PATH=/var/www/element-web WEBROOT=/var/www -DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq nginx postgresql python3-psycopg2 +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq nginx python3-psycopg2 -wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg -echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/matrix-org.list -apt update -DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq matrix-synapse-py3 -systemctl enable matrix-synapse - -ss -tulpen +inst_postgresql +inst_matrix mkdir -p /etc/nginx/ssl openssl req -x509 -nodes -days 3650 -newkey rsa:4096 -keyout /etc/nginx/ssl/matrix.key -out /etc/nginx/ssl/matrix.crt -subj "/CN=$MATRIX_FQDN" -addext "subjectAltName=DNS:$MATRIX_FQDN" @@ -47,9 +44,9 @@ server { server { listen 443 ssl; listen [::]:443 ssl; + http2 on; server_name $MATRIX_FQDN; - ssl on; ssl_certificate /etc/nginx/ssl/matrix.crt; ssl_certificate_key /etc/nginx/ssl/matrix.key; @@ -62,9 +59,9 @@ server { server { listen 8448 ssl; listen [::]:8448 ssl; + http2 on; server_name $MATRIX_FQDN; - ssl on; ssl_certificate /etc/nginx/ssl/matrix.crt; ssl_certificate_key /etc/nginx/ssl/matrix.key; @@ -97,9 +94,9 @@ server { server { listen 443 ssl; listen [::]:443 ssl; + http2 on; server_name $MATRIX_ELEMENT_FQDN; - ssl on; ssl_certificate /etc/nginx/ssl/matrix.crt; ssl_certificate_key /etc/nginx/ssl/matrix.key; diff --git a/src/onlyoffice/constants-service.conf b/src/onlyoffice/constants-service.conf index e5ffe58..9801b05 100644 --- a/src/onlyoffice/constants-service.conf +++ b/src/onlyoffice/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/onlyoffice/install-service.sh b/src/onlyoffice/install-service.sh index 4b1627a..ff4c9f3 100644 --- a/src/onlyoffice/install-service.sh +++ b/src/onlyoffice/install-service.sh @@ -9,20 +9,20 @@ source /root/functions.sh source /root/zamba.conf source /root/constants-service.conf +set -euo pipefail + ONLYOFFICE_DB_PASS=$(random_password) -curl -fsSL https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE | gpg --dearmor | tee /etc/apt/trusted.gpg.d/onlyoffice.gpg >/dev/null -echo "deb https://download.onlyoffice.com/repo/debian squeeze main" > /etc/apt/sources.list.d/onlyoffice.list +inst_postgresql -cat > /etc/apt/preferences.d/onlyoffice << EOF -Package: onlyoffice-documentserver -Pin: version 7.1.1-23 -Pin-Priority: 900 -EOF +#cat > /etc/apt/preferences.d/onlyoffice << EOF +#Package: onlyoffice-documentserver +#Pin: version 7.1.1-23 +#Pin-Priority: 900 +#EOF -apt update -DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq postgresql rabbitmq-server libstdc++6 supervisor +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq rabbitmq-server libstdc++6 supervisor su postgres < /root/onlyoffice.credentials ONLYOFFICE_DB_HOST=$ONLYOFFICE_DB_HOST diff --git a/src/urbackup/install-service.sh b/src/urbackup/install-service.sh index 5212346..959aec8 100644 --- a/src/urbackup/install-service.sh +++ b/src/urbackup/install-service.sh @@ -9,6 +9,8 @@ source /root/functions.sh source /root/zamba.conf source /root/constants-service.conf +set -euo pipefail + mkdir -p /$LXC_SHAREFS_MOUNTPOINT/tmp mkdir -p /$LXC_SHAREFS_MOUNTPOINT/$URBACKUP_DATA mkdir -p /etc/urbackup