From 6ac42db232060a05d5d625dec8483223d41a349c Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Wed, 7 Dec 2022 03:43:39 -0500 Subject: [PATCH] feat(wordpress): Add https + reverse-proxy (#5179) * feat(wordpress): Add https + reverse-proxy * add enum * conflict * remove enable https * Update charts/incubator/wordpress/values.yaml Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> * no upgrade Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros kois --- charts/incubator/wordpress/Chart.yaml | 2 +- charts/incubator/wordpress/questions.yaml | 6 ++++++ charts/incubator/wordpress/templates/_env.tpl | 1 + charts/incubator/wordpress/values.yaml | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/incubator/wordpress/Chart.yaml b/charts/incubator/wordpress/Chart.yaml index dadd3915f71..867d109c4b3 100644 --- a/charts/incubator/wordpress/Chart.yaml +++ b/charts/incubator/wordpress/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/wordpress - https://hub.docker.com/_/wordpress - https://www.wordpress.org -version: 0.0.5 +version: 1.0.0 annotations: truecharts.org/catagories: | - website diff --git a/charts/incubator/wordpress/questions.yaml b/charts/incubator/wordpress/questions.yaml index 9b53dce2b34..5689eb90c3e 100644 --- a/charts/incubator/wordpress/questions.yaml +++ b/charts/incubator/wordpress/questions.yaml @@ -59,6 +59,12 @@ questions: type: string required: true default: Truecharts Blog + - variable: enable_reverse_proxy_headers + label: Wordpress Reverse Proxy Headers Support + description: Enable WordPress support for reverse proxy headers + schema: + type: boolean + default: true - variable: smtp group: App Configuration label: SMTP Configuration diff --git a/charts/incubator/wordpress/templates/_env.tpl b/charts/incubator/wordpress/templates/_env.tpl index be6a6a5bb29..f6f26fac042 100644 --- a/charts/incubator/wordpress/templates/_env.tpl +++ b/charts/incubator/wordpress/templates/_env.tpl @@ -23,6 +23,7 @@ data: WORDPRESS_FIRST_NAME: {{ .Values.wordpress.first_name | quote }} WORDPRESS_LAST_NAME: {{ .Values.wordpress.last_name | quote }} WORDPRESS_BLOG_NAME: {{ .Values.wordpress.blog_name | quote }} + WORDPRESS_ENABLE_REVERSE_PROXY: {{ ternary "yes" "no" .Values.wordpress.enable_reverse_proxy_headers | quote }} {{- if .Values.smtp.enabled }} WORDPRESS_SMTP_HOST: {{ .Values.smtp.host | quote }} diff --git a/charts/incubator/wordpress/values.yaml b/charts/incubator/wordpress/values.yaml index 43d40ea875e..d6b5d8272ef 100644 --- a/charts/incubator/wordpress/values.yaml +++ b/charts/incubator/wordpress/values.yaml @@ -16,6 +16,7 @@ wordpress: first_name: TrueCharts last_name: TrueCharts blog_name: Truecharts Blog + enable_reverse_proxy_headers: true smtp: enabled: false