diff --git a/infrastructure/somleng/core/route53.tf b/infrastructure/somleng/core/route53.tf index 654c03ab..72f15520 100644 --- a/infrastructure/somleng/core/route53.tf +++ b/infrastructure/somleng/core/route53.tf @@ -1,3 +1,7 @@ +resource "aws_route53domains_registered_domain" "somleng_org" { + domain_name = "somleng.org" +} + resource "aws_route53_zone" "somleng_org" { name = "somleng.org." } diff --git a/infrastructure/somleng/somleng.com/.terraform.lock.hcl b/infrastructure/somleng/somleng.com/.terraform.lock.hcl index d6ef7eb1..3fdbb32e 100644 --- a/infrastructure/somleng/somleng.com/.terraform.lock.hcl +++ b/infrastructure/somleng/somleng.com/.terraform.lock.hcl @@ -2,38 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.18.0" + version = "5.75.1" constraints = ">= 3.8.0" hashes = [ - "h1:62MWy6fGx/cVk1DnLcc8rUxCCKhi6/R9fi/Af/ph9ag=", - "zh:100a11324326bf849b4c85d3c40a81e485726eee99c5a229387b8485a7a8da8b", - "zh:2226bbf97101af90e43cd5606d8678f35d7e7b477657d9297c42a1bd2ed42750", - "zh:27d51694300c08c32312f8832b889c57a2821dc022d49d38f9b1e14810f8a3fb", - "zh:2b8792c76986facfd415f967c5d61022f7ceeaa46c158037fe8939e36d954f99", - "zh:3ea787967de772cc3a13469753080c8fa81be5aefc735d3753c7627f63c948e5", - "zh:64d58463cbb2b93d5202ef311a101890a1e083f9587f3eabb9f2e26dd0cf8f43", + "h1:uz55I4t3Pqy3p+82NZ35mkUA9mZ5yu4pS6beZMI8wpA=", + "zh:1075825e7311a8d2d233fd453a173910e891b0320e8a7698af44d1f90b02621d", + "zh:203c5d09a03fcaa946defb8459f01227f2fcda07df768f74777beb328d6751ae", + "zh:21bc79ccb09bfdeb711a3a5226c6c4a457ac7c4bb781dbda6ade7be38461739f", + "zh:2bac969855b62a0ff6716954be29387a1f9793626059122cda4681206396e309", + "zh:4b65ea5b51058f05b9ec8797f76184e19e5b38a609029fe2226af3fa4ad289b3", + "zh:5065d7df357fb3ee2b0a2520bbcff6335c0c47bfb9e8e9932bad088c3ab7efd3", + "zh:678a4015a4cd26af5c2b30dfd9290b8a01e900668fa0fec6585dfd1838f1cebd", + "zh:6ddc5dfdd4a0dddca027db99a7bfa9a0978933119d63af81acb6020728405119", + "zh:98c0d48b09842c444dbcbddd279e5b5b1e44113951817a8ecc28896bb4ad1dd7", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b10eecf4c034a229712825124e7c0b765c5904648550dc8f844f68638531d337", - "zh:d9a3cc46e2746c40ea69bcfb2d12e765ee6bda3e1ed8ce73f272d492ff4836bb", - "zh:df625e57aa3b5fb3e4562da44daf6565289818ba2a7e66f86ad968b43fdb5148", - "zh:eaaa3a5d2a15a87b346e521872120a3ca7f6777a04226a55f51022eaf4097963", - "zh:ec6f4b00ae4f9d536f2a6c2e5a5f149867194268ce9068a9c348bc3e678fbfce", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", + "zh:aad169fea072842c0b54f1ff95f1ec6558d6c5af3ea4c159308583db59003b09", + "zh:bd2625ed8e1ff29ac6ed3a810d7b68a090add5fcb2fce4122669bd37e1eb9f1d", + "zh:c6f57625e26a6ef1ffb49bfa0e6148496ad12d80c857f6bb222e21f293a2a78a", + "zh:c7cd085326c5eb88804b11a4bc0fbc8376f06138f4b9624fb25cd06ea8687cdd", + "zh:f60c98139f983817d4d08f4138b1e53f31f91176ff638631e8dd38b6de36fce0", ] } diff --git a/infrastructure/somleng/somleng.com/chime.tf b/infrastructure/somleng/somleng.com/chime.tf index ed95cb57..bb80446e 100644 --- a/infrastructure/somleng/somleng.com/chime.tf +++ b/infrastructure/somleng/somleng.com/chime.tf @@ -6,9 +6,11 @@ resource "aws_chime_voice_connector" "this" { } resource "aws_chime_voice_connector_termination" "this" { - cidr_allow_list = ["13.250.230.15/32"] + cidr_allow_list = ["13.250.230.15/32", "52.4.242.134/32"] calling_regions = ["KH"] voice_connector_id = aws_chime_voice_connector.this.id + + provider = aws.us-east-1 } resource "aws_chime_voice_connector_origination" "this" { @@ -21,9 +23,12 @@ resource "aws_chime_voice_connector_origination" "this" { priority = 1 weight = 1 } + + provider = aws.us-east-1 } resource "aws_chime_voice_connector_logging" "this" { enable_sip_logs = true voice_connector_id = aws_chime_voice_connector.this.id + provider = aws.us-east-1 } diff --git a/infrastructure/somleng/somleng.com/route53.tf b/infrastructure/somleng/somleng.com/route53.tf index 04247f56..f23dd9c6 100644 --- a/infrastructure/somleng/somleng.com/route53.tf +++ b/infrastructure/somleng/somleng.com/route53.tf @@ -1,3 +1,7 @@ +resource "aws_route53domains_registered_domain" "somleng_com" { + domain_name = "somleng.com" +} + resource "aws_route53_zone" "somleng_com" { name = "somleng.com" } @@ -8,7 +12,7 @@ resource "aws_route53_record" "somleng_com" { type = "A" alias { - name = aws_s3_bucket.somleng_com.website_domain + name = aws_s3_bucket_website_configuration.somleng_com.website_domain zone_id = aws_s3_bucket.somleng_com.hosted_zone_id evaluate_target_health = true } @@ -20,7 +24,7 @@ resource "aws_route53_record" "www_somleng_com" { type = "A" alias { - name = aws_s3_bucket.www_somleng_com.website_domain + name = aws_s3_bucket_website_configuration.www_somleng_com.website_domain zone_id = aws_s3_bucket.www_somleng_com.hosted_zone_id evaluate_target_health = true } diff --git a/infrastructure/somleng/somleng.com/s3.tf b/infrastructure/somleng/somleng.com/s3.tf index 43afd86b..c63b7148 100644 --- a/infrastructure/somleng/somleng.com/s3.tf +++ b/infrastructure/somleng/somleng.com/s3.tf @@ -11,7 +11,7 @@ resource "aws_s3_bucket_website_configuration" "somleng_com" { redirect_all_requests_to { host_name = "www.somleng.org" - protocol = "https" + protocol = "https" } } @@ -20,6 +20,6 @@ resource "aws_s3_bucket_website_configuration" "www_somleng_com" { redirect_all_requests_to { host_name = "www.somleng.org" - protocol = "https" + protocol = "https" } }