diff --git a/apps/wordpress/wordpress_ConfigMap.tf b/apps/wordpress/wordpress_ConfigMap.tf index a485ab6..94d7bd4 100644 --- a/apps/wordpress/wordpress_ConfigMap.tf +++ b/apps/wordpress/wordpress_ConfigMap.tf @@ -11,15 +11,20 @@ resource "kubectl_manifest" "wordpress_cfg" { WORDPRESS_DB_NAME: ${var.component} WORDPRESS_DB_USER: ${var.component} WORDPRESS_HOST: ${local.dns_name} - 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 @@ -37,15 +42,14 @@ resource "kubectl_manifest" "wordpress_files" { data: "vynil-configurator.sh": |- #!/usr/bin/env bash - 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_MAIL}" \ - --locale="${var.config.locale}" \ - --skip-email + 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 wp-cli: |- #!/bin/sh