Skip to content

Commit

Permalink
fixes nextcloud#70 saving phpConfigs files to the right directory whe…
Browse files Browse the repository at this point in the history
…n using fpm

- When using nginx + nextcloud fpm image, `phpConfigs` are now mounted to /usr/local/etc/php-fpm.d instead of /usr/local/etc/php/conf.d
  • Loading branch information
aitorpazos committed Feb 2, 2021
1 parent 9a00db5 commit b550e0d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion charts/nextcloud/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,10 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- $nginxEnabled := .Values.nginx.enabled -}}
{{- range $key, $value := .Values.nextcloud.phpConfigs }}
- name: nextcloud-phpconfig
mountPath: /usr/local/etc/php/conf.d/{{ $key }}
mountPath: {{ $nginxEnabled | ternary (printf "/usr/local/etc/php-fpm.d/%s" $key | quote) (printf "/usr/local/etc/php/conf.d/%s" $key | quote) }}
subPath: {{ $key }}
{{- end }}
{{- if .Values.nextcloud.extraVolumeMounts }}
Expand Down
2 changes: 1 addition & 1 deletion charts/nextcloud/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ nextcloud:
name: user
password: pass
# PHP Configuration files
# Will be injected in /usr/local/etc/php/conf.d
# Will be injected in /usr/local/etc/php/conf.d for apache image and in /usr/local/etc/php-fpm.d when nginx.enabled: true
phpConfigs: {}
# Default config files
# IMPORTANT: Will be used only if you put extra configs, otherwise default will come from nextcloud itself
Expand Down

0 comments on commit b550e0d

Please sign in to comment.