6 Commits

5 changed files with 39 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
variables:
HELM_CHART_VERSION: "0.8.7"
HELM_CHART_VERSION: "0.8.12"
stages:
- deploy

View File

@@ -2,5 +2,5 @@ apiVersion: v2
name: cloudypress
description: Helm chart to deploy Wordpress backed by PHP-CLI and Nginx Unit
type: application
version: "0.8.7"
appVersion: "6.2.0"
version: "0.8.12"
appVersion: "6.2.2"

View File

@@ -28,7 +28,12 @@ data:
SMTP_FROM_NAME: "V3 Customer Mailer"
{{- end }}
{{- if and .Values.site .Values.site.overrideEnvironment }}
WP_ENV: "{{ .Values.site.overrideEnvironment }}"
{{- else }}
WP_ENV: "production"
{{- end }}
{{- if .Values.site.overrideMainUrl }}
WP_HOME: "https://{{ .Values.site.overrideMainUrl }}"
{{- else }}
@@ -129,6 +134,28 @@ data:
]
}
},
{{- if eq .Values.site.enableWebpRoute "true" }}
{
"match": {
"uri": [
"*.jpg",
"*.jpeg",
"*.gif",
"*.png"
]
},
"action": {
"share": [
"/app/web$uri.webp",
"/app/web$uri"
],
"fallback": {
"pass": "applications/php/index"
}
}
},
{{- end }}
{
"action": {
"share": "/app/web$uri",
@@ -151,13 +178,13 @@ data:
{{- 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" }}",
"disable_functions": "{{ .Values.global.php.disableFunctions | default "exec,passthru,shell_exec,system,proc_open,popen,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",
"disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,show_source",
"log_errors": "On",
{{- end }}
{{- if .Values.global.php.adminValues }}

View File

@@ -2,7 +2,6 @@ apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: global-secrets-ext
namespace: {{ include "..fullname" . }}
labels:
{{- include "..labels" . | nindent 8 }}
spec:

View File

@@ -44,6 +44,12 @@ site:
additional_env: {}
# MY_ENV_VAR: "value"
# Whether to enable the webp route
# enableWebpRoute: "false"
# Override the environment. Valid values are production, staging and development
# overrideEnvironment: "staging"
# Create sites with another main domain for WP,
# but the rest of the components named according to site-tld
# overrideMainUrl: ""
@@ -133,7 +139,7 @@ global:
limitExtensions: ".php"
exposePHP: "Off"
shortOpenTag": "Off"
disableFunctions: "exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,show_source"
disableFunctions: "exec,passthru,shell_exec,system,proc_open,popen,show_source"
logErrors: "On"
adminValues: