Release version 1.0.0
This commit is contained in:
Lars
@@ -5,35 +5,46 @@ metadata:
|
||||
labels:
|
||||
{{- include "..labels" . | nindent 8 }}
|
||||
data:
|
||||
{{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }}
|
||||
SMTP_PORT: '2525'
|
||||
{{- else }}
|
||||
SMTP_PORT: '587'
|
||||
{{- if .Values.email.smtpHost }}
|
||||
SMTP_HOST: {{ .Values.email.smtpHost }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.smtpPort }}
|
||||
SMTP_PORT: {{ .Values.email.smtpPort | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.smtpAuth }}
|
||||
SMTP_AUTH: 'True'
|
||||
{{- if .Values.email.smtpUser }}
|
||||
SMTP_USER: {{ .Values.email.smtpUser }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.smtpPassword }}
|
||||
SMTP_PASSWORD: {{ .Values.email.smtpPassword }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.smtpStarttls }}
|
||||
SMTP_STARTTLS: 'True'
|
||||
{{- end }}
|
||||
SMTP_AUTH: 'true'
|
||||
SMTP_FROM: 'customer-noreply@v3.nu'
|
||||
{{- if .Values.email }}
|
||||
{{- if .Values.email.forceFromEmail }}
|
||||
SMTP_FORCE_FROM: {{ .Values.email.forceFromEmail }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.domains }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.defaultSender }}
|
||||
SMTP_FROM: {{ .Values.email.defaultSender }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.defaultSenderName }}
|
||||
SMTP_FROM_NAME: {{ .Values.email.defaultSenderName }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.forceSender }}
|
||||
SMTP_FORCE_FROM: {{ .Values.email.forceSender }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.domains }}
|
||||
SMTP_ALLOWONLY_DOMAINS: {{ .Values.email.domains | join "," }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.allowedEmails }}
|
||||
{{- end }}
|
||||
{{- if .Values.email.allowedEmails }}
|
||||
SMTP_ALLOWONLY_EMAILS: {{ .Values.email.allowedEmails | join "," }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
SMTP_FORCE_FROM: "customer-noreply@v3.nu"
|
||||
SMTP_FROM_NAME: "V3 Customer Mailer"
|
||||
{{- end }}
|
||||
WP_ENV: "{{ .Values.site.environment | default "production" }}"
|
||||
WP_HOME: "https://{{ ( .Values.site.redirectDomain | default ( .Values.site.domain )) | replace "https://" "" | replace "http://" "" }}"
|
||||
{{- if .Values.site.additionalEnv }}
|
||||
{{- range $k, $v := .Values.site.additionalEnv }}
|
||||
{{- end }}
|
||||
WP_HOME: "https://{{ .Values.site.domain | replace "http://" "" | replace "https://" "" }}"
|
||||
|
||||
{{- if .Values.site.additionalEnv }}
|
||||
{{- range $k, $v := .Values.site.additionalEnv }}
|
||||
{{ $k }}: {{ $v }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
---
|
||||
kind: ConfigMap
|
||||
apiVersion: v1
|
||||
@@ -49,13 +60,17 @@ data:
|
||||
"webserverGroup": "unit",
|
||||
"applicationDir": "/app",
|
||||
"permissions": "0770",
|
||||
"updatePermissions": true,
|
||||
"importDatabase": {{ .Values.database.import | default false }},
|
||||
"databasePath": "{{ .Values.database.importPath | default "" }}",
|
||||
"overwriteDatabase": {{ .Values.database.overwrite | default false }},
|
||||
"updatePermissions": {{ .Values.init.wp.updatePermissions | default false }},
|
||||
"importDatabase": {{ .Values.init.db.active | default false }},
|
||||
"databasePath": "{{ .Values.init.db.path | default "" }}",
|
||||
"databaseUrl": "{{ .Values.init.db.url | default "" }}",
|
||||
"importContent": {{ .Values.init.content.active | default false }},
|
||||
"contentPath": "{{ .Values.init.content.path | default "" }}",
|
||||
"contentUrl": "{{ .Values.init.content.url | default "" }}",
|
||||
"overwriteDatabase": {{ .Values.init.db.overwrite | default false }},
|
||||
"generateSalts": true,
|
||||
"activateTheme": "{{ .Values.site.theme | default .Values.site.name }}",
|
||||
"convertUploadsToWebp": {{ .Values.site.enableWebpConversion | default false }},
|
||||
"activateTheme": "{{ .Values.init.wp.theme | default .Values.site.name }}",
|
||||
"convertUploadsToWebp": {{ .Values.init.content.webpConverter | default false }},
|
||||
"convertMissingOnly": true
|
||||
}
|
||||
|
||||
@@ -133,7 +148,7 @@ data:
|
||||
]
|
||||
}
|
||||
},
|
||||
{{- if eq .Values.site.enableWebpRoute "true" }}
|
||||
{{- if (.Values.site.webpRoute | default "true") }}
|
||||
{
|
||||
"match": {
|
||||
"uri": [
|
||||
@@ -175,25 +190,30 @@ data:
|
||||
},
|
||||
"options": {
|
||||
"user": {
|
||||
"display_errors": "{{ .Values.site.displayErrors | default "0" }}",
|
||||
"log_errors": "{{ .Values.site.logErrors | default "1" }}"
|
||||
{{- if and .Values.php .Values.php.additionalValues }}
|
||||
{{- range $k, $v := .Values.php.additionalValues }}
|
||||
"{{ $k }}": "{{ $v }}",
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
"display_errors": "{{ .Values.php.displayErrors | default "Off" }}",
|
||||
"log_errors": "{{ .Values.php.logErrors | default "On" }}"
|
||||
},
|
||||
"admin": {
|
||||
"expose_php": "Off",
|
||||
"short_open_tag": "Off",
|
||||
"disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,show_source",
|
||||
"log_errors": "On",
|
||||
{{- if and .Values.advanced .Values.advanced.php .Values.advanced.php.additionalAdminValues }}
|
||||
{{- range $k, $v := .Values.advanced.php.additionalAdminValues }}
|
||||
"{{ $k }}": "{{ $v }}",
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
"memory_limit": "{{ .Values.site.resources.php.memory | default "512M" }}",
|
||||
"upload_max_filesize": "{{ .Values.site.resources.php.upload | default "512M" }}",
|
||||
"post_max_size": "{{ .Values.site.resources.php.post | default "512M" }}",
|
||||
"max_execution_time": "{{ .Values.site.resources.php.executionTime | default "300" }}",
|
||||
"max_input_time": "{{ .Values.site.resources.php.inputTime | default "300" }}",
|
||||
{{- end }}
|
||||
"log_errors": "{{ .Values.php.logErrors | default "On" }}",
|
||||
{{- if and .Values.php .Values.php.additionalAdminValues }}
|
||||
{{- range $k, $v := .Values.php.additionalAdminValues }}
|
||||
"{{ $k }}": "{{ $v }}",
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
"memory_limit": "{{ .Values.site.resources.php.memory | default "512M" }}",
|
||||
"upload_max_filesize": "{{ .Values.site.resources.php.upload | default "512M" }}",
|
||||
"post_max_size": "{{ .Values.site.resources.php.post | default "512M" }}",
|
||||
"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" }}"
|
||||
}
|
||||
},
|
||||
@@ -209,3 +229,20 @@ data:
|
||||
}
|
||||
}
|
||||
}
|
||||
{{- if .Values.storage.configMap }}
|
||||
{{- range .Values.storage.configMap }}
|
||||
{{- if eq .type "configmap" }}
|
||||
---
|
||||
kind: ConfigMap
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: {{ include "..fullname" $ }}-cm-{{ .name }}
|
||||
labels:
|
||||
{{- include "..labels" $ | nindent 8 }}
|
||||
data:
|
||||
{{- range $k, $v := .files }}
|
||||
{{ $v.name }}: {{ $v.content | toYaml | indent 4}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
Reference in New Issue
Block a user