diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02169c5..4e91244 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - HELM_CHART_VERSION: "0.5.12" + HELM_CHART_VERSION: "0.5.13" stages: - deploy diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml index 20b1007..47dfa2d 100644 --- a/Chart/templates/configmap.yaml +++ b/Chart/templates/configmap.yaml @@ -151,16 +151,14 @@ data: "type": "php", "options": { "user": { - "display_errors": "{{ .Values.site.displayErrors | default "0" }}" + "display_errors": "{{ .Values.site.displayErrors | default "0" }}", "log_errors": "{{ .Values.site.logErrors | default "1" }}" }, "admin": { "expose_php": "Off", "short_open_tag": "Off", "disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,show_source", - "log_errors": "On", - "date.timezone": "{{ .Values.customer.timezone | default "Europe/Stockholm" }}", - + "log_errors": "On", {{- if and .Values.advanced .Values.advanced.php .Values.advanced.php.additionalAdminValues }} {{- range $k, $v := .Values.advanced.php.additionalAdminValues }} "{{ $k }}": "{{ $v }}", @@ -172,6 +170,7 @@ data: "max_execution_time": "{{ .Values.site.resources.php.executionTime | default "300" }}", "max_input_time": "{{ .Values.site.resources.php.inputTime | default "300" }}", {{- end }} + "date.timezone": "{{ .Values.customer.timezone | default "Europe/Stockholm" }}" } }, "targets": {