diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae44538..3493ceb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - HELM_CHART_VERSION: "0.7.1" + HELM_CHART_VERSION: "0.3.33" stages: - deploy diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml index ac80cf3..e5109c1 100644 --- a/Chart/templates/configmap.yaml +++ b/Chart/templates/configmap.yaml @@ -64,6 +64,112 @@ metadata: labels: {{- include "..labels" . | nindent 8 }} data: + unit.json: |- + { + "settings": { + "http": { + "header_read_timeout": 60, + "body_read_timeout": 60, + "idle_timeout": 60, + "max_body_size": 512111110 + } + }, + "listeners": { + "*:8080": { + "pass": "routes" + } + }, + "routes": [ + { + "action": { + "return": 200 + }, + "match": { + "uri": [ + "/unit-ping", + "/fpm-ping" + ] + } + }, + { + "action": { + "return": 404 + }, + "match": { + "uri": [ + "/app/uploads/*.php", + "/app/uploads/*.php/*" + ] + } + }, + { + "action": { + "pass": "applications/php/direct" + }, + "match": { + "uri": [ + "*.php", + "*.php/*", + "/wp-admin/", + "/wp/wp-admin/" + ] + } + }, + { + "action": { + "share": "/app/web$uri", + "fallback": { + "pass": "applications/php/direct" + } + } + } + ], + + "applications": { + "php": { + "type": "php", + "options": { + "user": { + "display_errors": "0", + "log_errors": "1", + }, + "admin": { + {{- if and .Values.global .Values.global.php }} + "expose_php": "{{ .Values.global.php.exposePHP | default "Off" }}", + "short_open_tag": "{{ .Values.global.php.shortOpenTag | default "Off" }}", + "disable_functions": "{{ .Values.global.php.disableFunctions | default "exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,show_source" }}", + "log_errors": "{{ .Values.global.php.logErrors | default "On" }}", + "date.timezone": "{{ .Values.customer.timezone | default "Europe/Stockholm" }}", + {{- else }} + "expose_php": "Off", + "short_open_tag": "Off", + "disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,show_source", + "log_errors": "On", + {{- end }} + {{- if .Values.global.php.adminValues }} + {{- range $k, $v := .Values.global.php.adminValues }} + "{{ $k }}": "{{ $v }}", + {{- end }} + {{- end }} + "memory_limit": "512M", + "upload_max_filesize": "512M", + "post_max_size": "512M", + "max_execution_time": "300", + "max_input_time": "300" + } + }, + "targets": { + "direct": { + "root": "/app/web" + }, + "index": { + "root": "/app/web", + "script": "index.php" + } + } + } + } + } www.conf: |- [www] diff --git a/Chart/templates/deployment.yaml b/Chart/templates/deployment.yaml index 84a3071..077fe28 100644 --- a/Chart/templates/deployment.yaml +++ b/Chart/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: containers: - name: wordpress securityContext: - runAsUser: 65534 + runAsUser: 101 {{- if .Values.global }} image: {{ .Values.global.serverImage | default "ghcr.io/cloudynes/php-nginx" }}:{{ .Values.global.imagetag | default "latest" }} {{- else }}