DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases 1 Wiki Activity

feat(nextcloud/collabora): Add collabora as a nextcloud dependency (#3097)

Browse Source 
* feat(nextcloud/collabora): Add collabora as a nextcloud dependency

* Turn collabora into a statefull set

* àdd collabora dependency

* app-data storage to userdata

* disable collabora for now

* also set access url (service) availability before trying to lock into the HPB
This commit is contained in:
Kjeld Schouten-Lebbing
2022-07-08 15:44:55 +02:00
committed by GitHub
parent b3f4b0500d
commit f6a77b3bad
15 changed files with 82 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/nextcloud/templates/_configmap.tpl
+7
View File
@@ -21,6 +21,13 @@ kind: ConfigMap
metadata:
name: nextcloudconfig
data:
{{- $aliasgroup1 := ( printf "http://%s" ( .Values.env.AccessIP | default ( printf "%v-%v" .Release.Name "nextcloud" ) ) ) }}
{{- if .Values.ingress.main.enabled }}
{{- with (first .Values.ingress.main.hosts) }}
{{- $aliasgroup1 = ( printf "https://%s" .host ) }}
{{- end }}
{{- end }}
aliasgroup1: {{ $aliasgroup1 }}
NEXTCLOUD_TRUSTED_DOMAINS: {{ ( printf "%v %v %v %v %v %v %v %v" "test.fakedomain.dns" "localhost" "127.0.0.1" ( printf "%v:%v" "127.0.0.1" .Values.service.main.ports.main.port ) ( .Values.env.AccessIP | default "localhost" ) ( printf "%v-%v" .Release.Name "nextcloud" ) ( printf "%v-%v" .Release.Name "nextcloud-backend" ) $hosts ) | quote }}
{{- if .Values.ingress.main.enabled }}
APACHE_DISABLE_REWRITE_IP: "1"
charts/stable/nextcloud/templates/_hpb.tpl
+5 -1
View File
@@ -81,13 +81,17 @@ command:
echo "High Performance Backend not running ... waiting..."
sleep 10
done
echo "High Performance Backend found..."
{{- $accessurl := ( printf "http://%v:%v" ( .Values.env.AccessIP | default ( printf "%v-%v" .Release.Name "nextcloud" ) ) .Values.service.main.ports.main.port ) }}
{{- if .Values.ingress.main.enabled }}
{{- with (first .Values.ingress.main.hosts) }}
{{- $accessurl = ( printf "https://%s" .host ) }}
{{- end }}
{{- end }}
until $(curl --output /dev/null --silent --head --fail -H "Host: test.fakedomain.dns" http://$accessurl/push/test/cookie); do
echo "High Performance Backend service not accessable ... waiting..."
sleep 10
done
echo "High Performance Backend found..."
echo "Configuring High Performance Backend for url: {{ $accessurl }}"
php /var/www/html/occ notify_push:setup {{ $accessurl }}/push
fg