nextcloud update

This commit is contained in:
Philip Haupt
2025-12-07 19:08:33 +01:00
parent 2b2aa58eae
commit e479fac8ed
3 changed files with 119 additions and 54 deletions

View File

@@ -5,13 +5,13 @@ data:
kind: ConfigMap
metadata:
annotations:
confighash: config-a0251c3c8340b1da71056e3746336992
confighash: config-ee2a94eb116f9a5697cf094b9203352a
labels:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: collabora
app.kubernetes.io/version: 24.04.5.2.1
helm.sh/chart: collabora-1.1.20
app.kubernetes.io/version: 25.04.7.2.1
helm.sh/chart: collabora-1.1.53
name: nextcloud-collabora
---
apiVersion: v1
@@ -57,10 +57,12 @@ data:
);
autoconfig.php: |-
<?php
$autoconfig_enabled = false;
if (getenv('SQLITE_DATABASE')) {
$AUTOCONFIG["dbtype"] = "sqlite";
$AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
$AUTOCONFIG['dbtype'] = 'sqlite';
$AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
$autoconfig_enabled = true;
} elseif (getenv('MYSQL_DATABASE_FILE') && getenv('MYSQL_USER_FILE') && getenv('MYSQL_PASSWORD_FILE') && getenv('MYSQL_HOST')) {
$AUTOCONFIG['dbtype'] = 'mysql';
@@ -70,11 +72,11 @@ data:
$AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
$autoconfig_enabled = true;
} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
$AUTOCONFIG["dbtype"] = "mysql";
$AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
$AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
$AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
$AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
$AUTOCONFIG['dbtype'] = 'mysql';
$AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
$AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
$AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
$AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
$autoconfig_enabled = true;
} elseif (getenv('POSTGRES_DB_FILE') && getenv('POSTGRES_USER_FILE') && getenv('POSTGRES_PASSWORD_FILE') && getenv('POSTGRES_HOST')) {
$AUTOCONFIG['dbtype'] = 'pgsql';
@@ -84,15 +86,16 @@ data:
$AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
$autoconfig_enabled = true;
} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
$AUTOCONFIG["dbtype"] = "pgsql";
$AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
$AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
$AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
$AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
$AUTOCONFIG['dbtype'] = 'pgsql';
$AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
$AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
$AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
$AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
$autoconfig_enabled = true;
}
if ($autoconfig_enabled) {
$AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
$AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
}
custom.config.php: |-
<?php
@@ -117,6 +120,10 @@ data:
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
if (getenv('REDIS_HOST_USER') !== false) {
$CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
}
}
reverse-proxy.config.php: |-
<?php
@@ -188,8 +195,8 @@ metadata:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nextcloud
app.kubernetes.io/version: 32.0.1
helm.sh/chart: nextcloud-8.5.2
app.kubernetes.io/version: 32.0.2
helm.sh/chart: nextcloud-8.6.0
name: nextcloud-config
---
apiVersion: v1
@@ -200,8 +207,8 @@ metadata:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nextcloud
app.kubernetes.io/version: 32.0.1
helm.sh/chart: nextcloud-8.5.2
app.kubernetes.io/version: 32.0.2
helm.sh/chart: nextcloud-8.6.0
name: nextcloud
spec:
ports:
@@ -222,8 +229,8 @@ metadata:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: collabora
app.kubernetes.io/version: 24.04.5.2.1
helm.sh/chart: collabora-1.1.20
app.kubernetes.io/version: 25.04.7.2.1
helm.sh/chart: collabora-1.1.53
type: main
name: nextcloud-collabora
spec:
@@ -248,8 +255,8 @@ metadata:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nextcloud
app.kubernetes.io/version: 32.0.1
helm.sh/chart: nextcloud-8.5.2
app.kubernetes.io/version: 32.0.2
helm.sh/chart: nextcloud-8.6.0
name: nextcloud-nextcloud
spec:
accessModes:
@@ -267,8 +274,8 @@ metadata:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nextcloud
app.kubernetes.io/version: 32.0.1
helm.sh/chart: nextcloud-8.5.2
app.kubernetes.io/version: 32.0.2
helm.sh/chart: nextcloud-8.6.0
name: nextcloud
spec:
replicas: 1
@@ -364,7 +371,7 @@ spec:
value: 172.19.0.0/16 10.0.0.0/16
- name: FORWARDED_FOR_HEADERS
value: HTTP_X_FORWARDED HTTP_FORWARDED_FOR
image: nextcloud:32.0.1-apache
image: docker.io/library/nextcloud:32.0.2-apache
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
@@ -523,7 +530,7 @@ spec:
value: 172.19.0.0/16 10.0.0.0/16
- name: FORWARDED_FOR_HEADERS
value: HTTP_X_FORWARDED HTTP_FORWARDED_FOR
image: nextcloud:32.0.1-apache
image: docker.io/library/nextcloud:32.0.2-apache
imagePullPolicy: IfNotPresent
name: nextcloud-cron
resources: {}
@@ -596,8 +603,8 @@ metadata:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: collabora
app.kubernetes.io/version: 24.04.5.2.1
helm.sh/chart: collabora-1.1.20
app.kubernetes.io/version: 25.04.7.2.1
helm.sh/chart: collabora-1.1.53
name: nextcloud-collabora
spec:
minReadySeconds: 0
@@ -616,7 +623,7 @@ spec:
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
confighash: config-a0251c3c8340b1da71056e3746336992
confighash: config-ee2a94eb116f9a5697cf094b9203352a
labels:
app.kubernetes.io/instance: nextcloud
app.kubernetes.io/name: collabora
@@ -637,7 +644,7 @@ spec:
envFrom:
- configMapRef:
name: nextcloud-collabora
image: collabora/code:24.04.5.2.1
image: collabora/code:25.04.7.2.1
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 4