fix(nextcloud): multiple small fixes (#3580)

* add non-blocking hpb url addition

* fix(nextcloud): multiple small fixes

* set default phone region to US to remove useless error

* fix typo

* Update charts/stable/nextcloud/templates/_hpb.tpl

Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update charts/stable/nextcloud/templates/_hpb.tpl

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* set CLI url before the rest of the commands are executed

* small verbosity tweaks

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
This commit is contained in:
Kjeld Schouten-Lebbing
2022-08-26 15:01:18 +00:00
committed by GitHub
co-authored by Stavros Kois
parent 6c5aa110ce
commit dc26a93fb6
4 changed files with 24 additions and 44 deletions
+9 -15
View File
@@ -103,22 +103,15 @@ initContainers:
- "-c"
- |
/bin/bash <<'EOF'
if [[ -f /data/config/config.php ]] && [[ ! -f /html/config/config.php ]]; then
echo "migrating from single to dual PVC's..."
echo "moving to placeholder location..."
mv -f /var/www/html/data/* /var/www/html/data/tomigrate/
echo "moving userdata to data-pvc root..."
mv -f /var/www/html/data/tomigrate/data/* /var/www/html/data/
echo "removing old data folder..."
rm -rf /var/www/html/data/tomigrate/data
echo "moving config, apps, templates and other content to html-pvc root..."
mv -f /var/www/html/data/tomigrate/* /var/www/html/
echo "Removing migration temporary folder..."
rm -rf /var/www/html/data/tomigrate
echo "Forcing permissions on userdata folder..."
if nfs4xdr_getfacl && nfs4xdr_getfacl | grep -qv "Failed to get NFSv4 ACL"; then
echo "NFSv4 ACLs detected, Trying to override permissions using nfs4_setfacl..."
nfs4_setfacl -R -a A:g:33:RWX "/var/www/html/data"
else
echo "No NFSv4 ACLs detected, trying to override permissions using chown/chmod..."
chown -R :33 "/var/www/html/data"
chmod 770 /var/www/html/data
fi
echo "Enforcing chmod 770 on data-dir..."
chmod 770 /var/www/html/data
echo "Migrating old data when found..."
EOF
volumeMounts:
@@ -139,6 +132,7 @@ env:
TRUSTED_PROXIES: "172.16.0.0/16 127.0.0.1"
POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}"
POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}"
NC_check_data_directory_permissions: "true"
POSTGRES_PASSWORD:
secretKeyRef:
name: dbcreds