diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ec84d4..5ba8581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - HELM_CHART_VERSION: "1.0.14" + HELM_CHART_VERSION: "1.0.15" stages: - deploy diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml index e5f15ec..afd1224 100644 --- a/Chart/templates/configmap.yaml +++ b/Chart/templates/configmap.yaml @@ -108,7 +108,7 @@ data: "match": { "uri": [ "/wp-admin", - "/wp-admin/*", + "/wp-admin/*" ] } }, @@ -183,9 +183,9 @@ data: "php": { "type": "php", "processes": { - "max": 10, - "spare": 1, - "idle_timeout": 20 + "max": {{ .Values.php.maxProc | default 5 }}, + "spare": {{ .Values.php.spareProc | default 1 }}, + "idle_timeout": {{ .Values.php.procIdleTimeout | default 65 }} }, "options": { "user": { diff --git a/Chart/values.yaml b/Chart/values.yaml index 6ab6254..6cc7707 100644 --- a/Chart/values.yaml +++ b/Chart/values.yaml @@ -154,12 +154,10 @@ email: emails: - email -unit: +php: maxProc: 5 spareProc: 2 - spareProcTimeout: 30 - -php: + procIdleTimeout: 65 logErrors: "On" displayErrors: "Off" additionalValues: {}