zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

random password: let the cloudsql module generate it

This commit is contained in:
Natalia Strelkova 2022-10-15 20:16:50 +00:00
parent 680eb656cb
commit 4ac24b68be
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/third-party-solutions/wordpress/cloudrun/cloudsql.tf
View File

@ -61,6 +61,6 @@ module "cloudsql" {
tier = local.cloudsql_conf.tier
databases = [local.cloudsql_conf.db]
users = {
"${local.cloudsql_conf.user}" = "${local.cloudsql_conf.pass}"
"${local.cloudsql_conf.user}" = var.cloudsql_password
}
}

3
blueprints/third-party-solutions/wordpress/cloudrun/main.tf
View File

@ -22,7 +22,6 @@ locals {
tier = "db-g1-small"
db = "wp-mysql"
user = "admin"
pass = var.cloudsql_password == null ? random_password.cloudsql_password.result : var.cloudsql_password
}
iam = {
# CloudSQL
@ -92,7 +91,7 @@ module "cloud_run" {
"WORDPRESS_DATABASE_HOST" : module.cloudsql.ip
"WORDPRESS_DATABASE_NAME" : local.cloudsql_conf.db
"WORDPRESS_DATABASE_USER" : local.cloudsql_conf.user
"WORDPRESS_DATABASE_PASSWORD" : local.cloudsql_conf.pass
"WORDPRESS_DATABASE_PASSWORD" : var.cloudsql_password == null ? module.cloudsql.user_passwords[local.cloudsql_conf.user] : var.cloudsql_password
"WORDPRESS_USERNAME" : local.wp_user
"WORDPRESS_PASSWORD" : local.wp_pass
}

2
blueprints/third-party-solutions/wordpress/cloudrun/outputs.tf
View File

@ -22,7 +22,7 @@ output "cloud_run_service" {
output "cloudsql_password" {
description = "CloudSQL password"
value = local.cloudsql_conf.pass
value = var.cloudsql_password == null ? module.cloudsql.user_passwords[local.cloudsql_conf.user] : var.cloudsql_password
sensitive = true
}