vynil/domain-incoming
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-05-17 09:25:38 +02:00
parent 29e521f710
commit 4b84e9b167
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/wordpress/database.tf
View File

@@ -59,7 +59,9 @@ resource "mysql_database" "component" {
resource "mysql_user" "component" { resource "mysql_user" "component" {
depends_on = [ kubectl_manifest.ndb ] depends_on = [ kubectl_manifest.ndb ]
user = var.component user = var.component
host = "%.${module.service.default_definition.name}.${var.namespace}.svc.cluster.%" # plante parfois :'(
#host = "%.${module.service.default_definition.name}.${var.namespace}.svc.cluster.%"
host = "%"
plaintext_password = random_password.mysql_comp_pass.result plaintext_password = random_password.mysql_comp_pass.result
} }
resource "mysql_grant" "component" { resource "mysql_grant" "component" {

3
apps/wordpress/wordpress_ConfigMap.tf
View File

@@ -14,7 +14,7 @@ resource "kubectl_manifest" "wordpress_cfg" {
WORDPRESS_ADMIN_MAIL: "svc-${var.instance}@${var.domain_name}" WORDPRESS_ADMIN_MAIL: "svc-${var.instance}@${var.domain_name}"
WORDPRESS_TITLE: "${var.instance}" WORDPRESS_TITLE: "${var.instance}"
WORDPRESS_TABLE_PREFIX: wp_ WORDPRESS_TABLE_PREFIX: wp_
WORDPRESS_DEBUG: "${var.config.is_debug?"true":"false"}" WORDPRESS_DEBUG: "${var.config.is_debug?"true":""}"
WORDPRESS_CONFIG_EXTRA: | WORDPRESS_CONFIG_EXTRA: |
#### general settings #### general settings
define('WP_HOME', 'https://${local.dns_name}'); define('WP_HOME', 'https://${local.dns_name}');
@@ -23,7 +23,6 @@ resource "kubectl_manifest" "wordpress_cfg" {
define( 'DISALLOW_FILE_EDIT', true ); define( 'DISALLOW_FILE_EDIT', true );
@ini_set( 'display_errors', '${var.config.is_debug?"On":"Off"}' ); @ini_set( 'display_errors', '${var.config.is_debug?"On":"Off"}' );
define( 'WP_DISABLE_FATAL_ERROR_HANDLER', ${var.config.is_debug?"true":"false"} ); 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"} ); define( 'WP_DEBUG_DISPLAY', ${var.config.is_debug?"true":"false"} );
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
$_SERVER['HTTPS'] = 'on'; $_SERVER['HTTPS'] = 'on';