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

Fix phpipam blueprint (#2119) 

* fix phpipam blueprint
This commit is contained in:
simonebruzzechesse 2024-02-29 09:33:07 +01:00 committed by GitHub
parent 30496068e2
commit a5f8c501a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/third-party-solutions/phpipam/README.md
View File

@ -236,5 +236,5 @@ module "test" {
}
project_id = "test-prj"
}
# tftest modules=7 resources=43
# tftest modules=8 resources=46
```

1
blueprints/third-party-solutions/phpipam/cloudsql.tf
View File

@ -35,6 +35,7 @@ module "cloudsql" {
users = {
"${local.cloudsql_conf.user}" = {
password = var.cloudsql_password
type = "BUILT_IN"
}
}
}

16
blueprints/third-party-solutions/phpipam/glb.tf
View File

@ -29,6 +29,22 @@ module "addresses" {
}
}
module "glb-redirect" {
source = "../../../modules/net-lb-app-ext"
count = local.glb_create ? 1 : 0
project_id = module.project.project_id
name = "phpipam-glb-redirect"
address = module.addresses.0.global_addresses["phpipam"].address
health_check_configs = {}
urlmap_config = {
description = "URL redirect for phpipam glb."
default_url_redirect = {
https = true
response_code = "MOVED_PERMANENTLY_DEFAULT"
}
}
}
# Global L7 HTTPS Load Balancer in front of Cloud Run
module "glb" {
source = "../../../modules/net-lb-app-ext"

19
blueprints/third-party-solutions/phpipam/main.tf
View File

@ -21,7 +21,11 @@ locals {
db = "phpipam"
user = "admin"
}
connector = var.connector == null ? module.cloud_run.vpc_connector : var.connector
cloudsql_password = coalesce(
var.cloudsql_password,
module.cloudsql.user_passwords[local.cloudsql_conf.user]
)
connector = coalesce(var.connector, module.cloud_run.vpc_connector)
domain = (
var.custom_domain != null ? var.custom_domain : (
var.phpipam_exposure == "EXTERNAL" ?
@ -112,12 +116,13 @@ module "cloud_run" {
env_from = null
# set up the database connection
env = {
"TZ" = "Europe/Rome"
"IPAM_DATABASE_HOST" = module.cloudsql.ip
"IPAM_DATABASE_USER" = local.cloudsql_conf.user
"IPAM_DATABASE_PASS" = var.cloudsql_password == null ? module.cloudsql.user_passwords[local.cloudsql_conf.user] : var.cloudsql_password
"IPAM_DATABASE_NAME" = local.cloudsql_conf.db
"IPAM_DATABASE_PORT" = "3306"
"TZ" = "Europe/Rome"
"IPAM_TRUST_X_FORWARDED" = "true"
"IPAM_DATABASE_HOST" = module.cloudsql.ip
"IPAM_DATABASE_USER" = local.cloudsql_conf.user
"IPAM_DATABASE_PASS" = local.cloudsql_password
"IPAM_DATABASE_NAME" = local.cloudsql_conf.db
"IPAM_DATABASE_PORT" = "3306"
}
}
}

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

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