From 2aef286f6801352904a7e90c520d85b0edbedcae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 17 May 2024 09:43:59 +0200
Subject: [PATCH] fix

---
 apps/wordpress/wordpress_ConfigMap.tf | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/apps/wordpress/wordpress_ConfigMap.tf b/apps/wordpress/wordpress_ConfigMap.tf
index 354e606..a485ab6 100644
--- a/apps/wordpress/wordpress_ConfigMap.tf
+++ b/apps/wordpress/wordpress_ConfigMap.tf
@@ -14,18 +14,12 @@ resource "kubectl_manifest" "wordpress_cfg" {
       WORDPRESS_ADMIN_MAIL: "svc-${var.instance}@${var.domain_name}"
       WORDPRESS_TITLE: "${var.instance}"
       WORDPRESS_TABLE_PREFIX: wp_
-      WORDPRESS_DEBUG: "${var.config.is_debug?"true":""}"
       WORDPRESS_CONFIG_EXTRA: |
         #### general settings
         define('WP_HOME', 'https://${local.dns_name}');
         define('WP_SITEURL', 'https://${local.dns_name}');
         define('WP_CACHE', true );
         define( 'DISALLOW_FILE_EDIT', true );
-        @ini_set( 'display_errors', '${var.config.is_debug?"On":"Off"}' );
-        define( 'WP_DISABLE_FATAL_ERROR_HANDLER', ${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
@@ -43,22 +37,13 @@ resource "kubectl_manifest" "wordpress_files" {
     data:
       "vynil-configurator.sh": |-
         #!/usr/bin/env bash
-        set -ex
-        if [ ! -f "$(pwd)/wp-config.php" ];then
-          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
-        fi
         if [ -z $(wp core is-installed) ]; then
           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}" \
+            --admin_email="$${WORDPRESS_ADMIN_MAIL}" \
             --locale="${var.config.locale}" \
             --skip-email
         fi