diff --git a/examples/complete-gitlab-setup/main.tf b/examples/complete-gitlab-setup/main.tf index 56f582f..6b0e28f 100644 --- a/examples/complete-gitlab-setup/main.tf +++ b/examples/complete-gitlab-setup/main.tf @@ -1,32 +1,17 @@ module "gitlab" { source = "../../" - create_gitlab_domain = true - gitlab_domain = "gitlab" - gitlab_fqdn = "gitlab.example.com" - hosted_zone = "example.com" - private_subnet_id = "subnet-u8dy389d78qhh338" - public_subnet_ids = [ - "subnet-h89dj8d3j2jd8", "subnet-jd8jq3dj89qj9jd3", "subnet-jd89jh89dj9dj9j9qw" - ] - volume_size = 30 - volume_type = "gp3" + gitlab_domain = "gitlab" + gitlab_fqdn = "gitlab.example.com" + hosted_zone = "example.com" + private_subnet_id = "subnet-u8dy389d78qhh338" + public_subnet_ids = ["subnet-h89dj8d3j2jd8", "subnet-jd8jq3dj89qj9jd3", "subnet-jd89jh89dj9dj9j9qw"] vpc_id = "vpc-89rh423789hr982h98" - create_acm_certificate = true - healthcheck_matcher = "200" - healthcheck_path = "/-/readiness" gitlab_ssh_public_key = "ssh publickey" - gitlab_pg_allocated_storage = 100 - gitlab_pg_db_instance_class = "db.m5.large" - gitlab_pg_db_name = "gitlabhq_production" - gitlab_pg_engine_version = "12.11" gitlab_pg_password = "foobarbaz" gitlab_pg_publicly_accessible = false - gitlab_pg_storage_type = "gp3" gitlab_pg_subnet_ids = ["subnet-u8dy389d78qhh338", "subnet-hde38hd89qhdwhw"] gitlab_pg_username = "gitlab" - gitlab_redis_engine_version = "7.0" - gitlab_redis_node_type = "cache.t3.medium" gitlab_redis_create_parameter_group = true gitlab_redis_parameter_group = { name = "gitlab-redis" diff --git a/examples/complete-gitlab-setup/outputs.tf b/examples/complete-gitlab-setup/outputs.tf index ff059dd..dc8dbb8 100644 --- a/examples/complete-gitlab-setup/outputs.tf +++ b/examples/complete-gitlab-setup/outputs.tf @@ -9,5 +9,6 @@ output "gitlab_redis_address" { } output "gitlab_url" { - value = module.gitlab.gitlab_complete_url + value = module.gitlab.gitlab_complete_url + description = "Gitlab url including the url schema" } diff --git a/outputs.tf b/outputs.tf index 4692735..0fea3d5 100644 --- a/outputs.tf +++ b/outputs.tf @@ -39,5 +39,6 @@ output "gitlab_redis_address" { } output "gitlab_complete_url" { - value = local.gitlab_complete_url + value = local.gitlab_complete_url + description = "Gitlab url including the url schema" } diff --git a/variables.tf b/variables.tf index 9a33cb9..99d3330 100644 --- a/variables.tf +++ b/variables.tf @@ -99,12 +99,6 @@ variable "healthcheck_interval" { default = 30 } -variable "healthcheck_matcher" { - type = string - default = "200" - description = "Response codes to use when checking for a healthy responses from a target." -} - variable "healthcheck_path" { type = string default = "/-/readiness"