From ea4e0ab87dba803dfbd27f1a39d35f7cb24f2c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 17 May 2024 08:57:28 +0200 Subject: [PATCH] fix --- apps/wordpress/wordpress_ConfigMap.tf | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/wordpress/wordpress_ConfigMap.tf b/apps/wordpress/wordpress_ConfigMap.tf index 5d0edf3..bd10949 100644 --- a/apps/wordpress/wordpress_ConfigMap.tf +++ b/apps/wordpress/wordpress_ConfigMap.tf @@ -25,6 +25,8 @@ resource "kubectl_manifest" "wordpress_cfg" { define( 'WP_DISABLE_FATAL_ERROR_HANDLER', ${var.config.is_debug?"true":"false"} ); define( 'WP_DEBUG', ${var.config.is_debug?"true":"false"} ); define( 'WP_DEBUG_DISPLAY', ${var.config.is_debug?"true":"false"} ); + if (isset(\$_SERVER['HTTP_X_FORWARDED_PROTO']) && \$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') + \$_SERVER['HTTPS'] = 'on'; #### memory limits # define('WP_MEMORY_LIMIT', '40' ); # default # define('WP_MAX_MEMORY_LIMIT', '256' ); # default @@ -41,9 +43,23 @@ resource "kubectl_manifest" "wordpress_files" { namespace: ${var.namespace} data: "vynil-configurator.sh": |- - #!/bin/sh + #!/usr/bin/env bash if [ -z $(wp core is-installed) ]; then echo Should configure.... + echo "$${WORDPRESS_CONFIG_EXTRA}" | wp config create \ + --dbname="$${WORDPRESS_DB_NAME}" \ + --dbuser="$${WORDPRESS_DB_USER}" \ + --dbpass="$${WORDPRESS_DB_PASSWORD}" \ + --dbhost="$${WORDPRESS_DB_HOST}" \ + --extra-php + wp core install \ + --url="https://$${WORDPRESS_HOST}" \ + --title="$${WORDPRESS_TITLE}" \ + --admin_user="$${WORDPRESS_ADMIN_NAME}" \ + --admin_password="$${WORDPRESS_ADMIN_PASSWORD}" \ + --admin_email=WORDPRESS_ADMIN_PASSWORD \ + --locale="${var.config.locale}" \ + --skip-email fi env wp-cli: |-