diff --git a/apps/wordpress/index.yaml b/apps/wordpress/index.yaml index 7458c9a..d0d65e7 100644 --- a/apps/wordpress/index.yaml +++ b/apps/wordpress/index.yaml @@ -121,9 +121,11 @@ options: default: admin_name: wordpress_admin is_debug: false + locale: fr_FR examples: - admin_name: wordpress_admin is_debug: false + locale: fr_FR properties: admin_name: default: wordpress_admin @@ -131,6 +133,9 @@ options: is_debug: default: false type: boolean + locale: + default: fr_FR + type: string type: object domain: default: your-company diff --git a/apps/wordpress/wordpress_ConfigMap.tf b/apps/wordpress/wordpress_ConfigMap.tf index 53c0029..1a9ee60 100644 --- a/apps/wordpress/wordpress_ConfigMap.tf +++ b/apps/wordpress/wordpress_ConfigMap.tf @@ -11,14 +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: "" + WORDPRESS_DEBUG: "${var.config.is_debug?"true":"false"}" 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', ${var.config.is_debug?"true":"false"} ); + define( 'WP_DEBUG_DISPLAY', ${var.config.is_debug?"true":"false"} ); #### memory limits # define('WP_MEMORY_LIMIT', '40' ); # default # define('WP_MAX_MEMORY_LIMIT', '256' ); # default diff --git a/apps/wordpress/wordpress_Secret.tf b/apps/wordpress/wordpress_Secret.tf index b03d7fb..9cdaa4a 100644 --- a/apps/wordpress/wordpress_Secret.tf +++ b/apps/wordpress/wordpress_Secret.tf @@ -38,11 +38,6 @@ resource "random_password" "NONCE_SALT" { special = false } -resource "random_password" "NONCE_SALT" { - length = 32 - special = false -} - resource "random_password" "ADM_PASS" { length = 18 special = false