bstein/titan-iac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nextcloud: restore single data volume mount

Browse Source
This commit is contained in:
Brad Stein 2026-01-07 03:52:14 -03:00
parent da81946771
commit 46c0a4e290
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/nextcloud/cronjob.yaml
View File

@ -24,14 +24,9 @@ spec:
args: args:
- "cd /var/www/html && php -f cron.php" - "cd /var/www/html && php -f cron.php"
volumeMounts: volumeMounts:
- name: nextcloud-app - name: nextcloud-data
mountPath: /var/www/html mountPath: /var/www/html
- name: nextcloud-user-data
mountPath: /var/www/html/data
volumes: volumes:
- name: nextcloud-app - name: nextcloud-data
persistentVolumeClaim: persistentVolumeClaim:
claimName: nextcloud-app claimName: nextcloud-data
- name: nextcloud-user-data
persistentVolumeClaim:
claimName: nextcloud-user-data

25
services/nextcloud/deployment.yaml
View File

@ -42,10 +42,8 @@ spec:
runAsUser: 0 runAsUser: 0
runAsGroup: 0 runAsGroup: 0
volumeMounts: volumeMounts:
- name: nextcloud-app - name: nextcloud-data
mountPath: /var/www/html mountPath: /var/www/html
- name: nextcloud-user-data
mountPath: /var/www/html/data
- name: nextcloud-config - name: nextcloud-config
mountPath: /var/www/html/config/extra.config.php mountPath: /var/www/html/config/extra.config.php
subPath: extra.config.php subPath: extra.config.php
@ -58,9 +56,7 @@ spec:
args: args:
- | - |
installed="$(su -s /bin/sh www-data -c "php /var/www/html/occ status" 2>/dev/null | awk '/installed:/{print $3}' || true)" installed="$(su -s /bin/sh www-data -c "php /var/www/html/occ status" 2>/dev/null | awk '/installed:/{print $3}' || true)"
if [ ! -s /var/www/html/config/config.php ] || [ "${installed}" != "true" ]; then if [ ! -s /var/www/html/config/config.php ] && [ ! -f /var/www/html/data/.ocdata ]; then
rm -f /var/www/html/config/config.php || true
rm -rf /var/www/html/data/* || true
su -s /bin/sh www-data -c "php /var/www/html/occ maintenance:install --database pgsql --database-host \"${POSTGRES_HOST}\" --database-name \"${POSTGRES_DB}\" --database-user \"${POSTGRES_USER}\" --database-pass \"${POSTGRES_PASSWORD}\" --admin-user \"${NEXTCLOUD_ADMIN_USER}\" --admin-pass \"${NEXTCLOUD_ADMIN_PASSWORD}\" --data-dir /var/www/html/data" su -s /bin/sh www-data -c "php /var/www/html/occ maintenance:install --database pgsql --database-host \"${POSTGRES_HOST}\" --database-name \"${POSTGRES_DB}\" --database-user \"${POSTGRES_USER}\" --database-pass \"${POSTGRES_PASSWORD}\" --admin-user \"${NEXTCLOUD_ADMIN_USER}\" --admin-pass \"${NEXTCLOUD_ADMIN_PASSWORD}\" --data-dir /var/www/html/data"
chown 33:33 /var/www/html/config/config.php || true chown 33:33 /var/www/html/config/config.php || true
chown -R 33:33 /var/www/html/data || true chown -R 33:33 /var/www/html/data || true
@ -143,10 +139,8 @@ spec:
name: nextcloud-oidc name: nextcloud-oidc
key: client-secret key: client-secret
volumeMounts: volumeMounts:
- name: nextcloud-app - name: nextcloud-data
mountPath: /var/www/html mountPath: /var/www/html
- name: nextcloud-user-data
mountPath: /var/www/html/data
- name: nextcloud-config - name: nextcloud-config
mountPath: /var/www/html/config/extra.config.php mountPath: /var/www/html/config/extra.config.php
subPath: extra.config.php subPath: extra.config.php
@ -232,14 +226,12 @@ spec:
- containerPort: 80 - containerPort: 80
name: http name: http
volumeMounts: volumeMounts:
- name: nextcloud-app - name: nextcloud-data
mountPath: /var/www/html mountPath: /var/www/html
- name: nextcloud-user-data
mountPath: /var/www/html/data
- name: nextcloud-config - name: nextcloud-config
mountPath: /var/www/html/config/extra.config.php mountPath: /var/www/html/config/extra.config.php
subPath: extra.config.php subPath: extra.config.php
resources: resources:
requests: requests:
cpu: 250m cpu: 250m
memory: 1Gi memory: 1Gi
@ -247,12 +239,9 @@ spec:
cpu: 1 cpu: 1
memory: 3Gi memory: 3Gi
volumes: volumes:
- name: nextcloud-app - name: nextcloud-data
persistentVolumeClaim: persistentVolumeClaim:
claimName: nextcloud-app claimName: nextcloud-data
- name: nextcloud-user-data
persistentVolumeClaim:
claimName: nextcloud-user-data
- name: nextcloud-config - name: nextcloud-config
configMap: configMap:
name: nextcloud-config name: nextcloud-config

11
services/nextcloud/maintenance-cronjob.yaml
View File

@ -34,10 +34,8 @@ spec:
name: nextcloud-admin name: nextcloud-admin
key: admin-password key: admin-password
volumeMounts: volumeMounts:
- name: nextcloud-app - name: nextcloud-data
mountPath: /var/www/html mountPath: /var/www/html
- name: nextcloud-user-data
mountPath: /var/www/html/data
- name: maintenance-script - name: maintenance-script
mountPath: /maintenance/maintenance.sh mountPath: /maintenance/maintenance.sh
subPath: maintenance.sh subPath: maintenance.sh
@ -49,12 +47,9 @@ spec:
cpu: 500m cpu: 500m
memory: 512Mi memory: 512Mi
volumes: volumes:
- name: nextcloud-app - name: nextcloud-data
persistentVolumeClaim: persistentVolumeClaim:
claimName: nextcloud-app claimName: nextcloud-data
- name: nextcloud-user-data
persistentVolumeClaim:
claimName: nextcloud-user-data
- name: maintenance-script - name: maintenance-script
configMap: configMap:
name: nextcloud-maintenance-script name: nextcloud-maintenance-script