diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | org-buetow-base/outputs.tf | 8 | ||||
| -rw-r--r-- | org-buetow-base/zone.tf | 5 | ||||
| -rw-r--r-- | org-buetow-ecs/audiobookshelfservice.tf | 6 | ||||
| -rw-r--r-- | org-buetow-ecs/nginxservice.tf | 6 | ||||
| -rw-r--r-- | org-buetow-ecs/vaultwardenservice.tf | 6 | ||||
| -rw-r--r-- | org-buetow-ecs/wallabagservice.tf | 8 | ||||
| -rw-r--r-- | org-buetow-elb/alb.tf | 2 | ||||
| -rw-r--r-- | org-buetow-helper/main.tf | 6 | ||||
| -rw-r--r-- | org-buetow-nextcloud/data.tf | 3 | ||||
| -rw-r--r-- | org-buetow-nextcloud/lb.tf | 6 | ||||
| -rw-r--r-- | org-buetow-nextcloud/main.tf | 4 |
12 files changed, 28 insertions, 33 deletions
@@ -5,7 +5,6 @@ * Nextcloud and Bastion: Auto re-create in different AZ on failure. * Backup EFS, don't let `terraform destroy` erease all my data! * Input variables, for configuring different service hosts. -* Maybe register `buetow.rocks` domain (or keep using `aws.buetow.org`) ## Create base environment diff --git a/org-buetow-base/outputs.tf b/org-buetow-base/outputs.tf index ea0ed87..21a1821 100644 --- a/org-buetow-base/outputs.tf +++ b/org-buetow-base/outputs.tf @@ -30,10 +30,10 @@ output "allow_outbound_sg_id" { value = aws_security_group.allow_outbound.id } -output "aws_buetow_org_zone_id" { - value = aws_route53_zone.aws_buetow_org.zone_id +output "buetow_cloud_zone_id" { + value = data.aws_route53_zone.buetow_cloud.zone_id } -output "aws_buetow_org_certificate_arn" { - value = "arn:aws:acm:eu-central-1:634617747016:certificate/4ae442c0-3b56-4e17-9a3f-023faf39d244" +output "buetow_cloud_certificate_arn" { + value = "arn:aws:acm:eu-central-1:634617747016:certificate/fbf5627c-9a4c-4c62-9c33-038e140f3f12" } diff --git a/org-buetow-base/zone.tf b/org-buetow-base/zone.tf index 49816df..139597f 100644 --- a/org-buetow-base/zone.tf +++ b/org-buetow-base/zone.tf @@ -1,3 +1,2 @@ -resource "aws_route53_zone" "aws_buetow_org" { - name = "aws.buetow.org." -} + + diff --git a/org-buetow-ecs/audiobookshelfservice.tf b/org-buetow-ecs/audiobookshelfservice.tf index 24ec968..6752a27 100644 --- a/org-buetow-ecs/audiobookshelfservice.tf +++ b/org-buetow-ecs/audiobookshelfservice.tf @@ -1,6 +1,6 @@ resource "aws_route53_record" "a_record_audiobookshelf" { - zone_id = data.terraform_remote_state.base.outputs.aws_buetow_org_zone_id - name = "audiobookshelf.aws.buetow.org." + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "audiobookshelf.buetow.cloud." type = "A" alias { @@ -144,7 +144,7 @@ resource "aws_lb_listener_rule" "audiobookshelf_https_listener_rule" { condition { host_header { - values = ["audiobookshelf.aws.buetow.org"] + values = ["audiobookshelf.buetow.cloud"] } } } diff --git a/org-buetow-ecs/nginxservice.tf b/org-buetow-ecs/nginxservice.tf index bae4ae4..da88488 100644 --- a/org-buetow-ecs/nginxservice.tf +++ b/org-buetow-ecs/nginxservice.tf @@ -1,6 +1,6 @@ resource "aws_route53_record" "a_record" { - zone_id = data.terraform_remote_state.base.outputs.aws_buetow_org_zone_id - name = "nginx.aws.buetow.org." + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "nginx.buetow.cloud." type = "A" alias { @@ -90,7 +90,7 @@ resource "aws_lb_listener_rule" "nginx_https_listener_rule" { condition { host_header { - values = ["nginx.aws.buetow.org"] + values = ["nginx.buetow.cloud"] } } } diff --git a/org-buetow-ecs/vaultwardenservice.tf b/org-buetow-ecs/vaultwardenservice.tf index 4eff90b..d4cf5e4 100644 --- a/org-buetow-ecs/vaultwardenservice.tf +++ b/org-buetow-ecs/vaultwardenservice.tf @@ -1,6 +1,6 @@ resource "aws_route53_record" "a_record_vaultwarden" { - zone_id = data.terraform_remote_state.base.outputs.aws_buetow_org_zone_id - name = "vaultwarden.aws.buetow.org." + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "vaultwarden.buetow.cloud." type = "A" alias { @@ -105,7 +105,7 @@ resource "aws_lb_listener_rule" "vaultwarden_https_listener_rule" { condition { host_header { - values = ["vaultwarden.aws.buetow.org"] + values = ["vaultwarden.buetow.cloud"] } } } diff --git a/org-buetow-ecs/wallabagservice.tf b/org-buetow-ecs/wallabagservice.tf index 939352c..a09f680 100644 --- a/org-buetow-ecs/wallabagservice.tf +++ b/org-buetow-ecs/wallabagservice.tf @@ -1,6 +1,6 @@ resource "aws_route53_record" "a_record_wallabag" { - zone_id = data.terraform_remote_state.base.outputs.aws_buetow_org_zone_id - name = "wallabag.aws.buetow.org." + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "wallabag.buetow.cloud." type = "A" alias { @@ -46,7 +46,7 @@ resource "aws_ecs_task_definition" "wallabag" { environment = [ { name = "SYMFONY__ENV__DOMAIN_NAME", - value = "https://wallabag.aws.buetow.org" + value = "https://wallabag.buetow.cloud" } ], mountPoints = [ @@ -126,7 +126,7 @@ resource "aws_lb_listener_rule" "wallabag_https_listener_rule" { condition { host_header { - values = ["wallabag.aws.buetow.org"] + values = ["wallabag.buetow.cloud"] } } } diff --git a/org-buetow-elb/alb.tf b/org-buetow-elb/alb.tf index eb7616d..b8a4504 100644 --- a/org-buetow-elb/alb.tf +++ b/org-buetow-elb/alb.tf @@ -59,7 +59,7 @@ resource "aws_lb_listener" "https_listener" { port = "443" protocol = "HTTPS" ssl_policy = "ELBSecurityPolicy-2016-08" - certificate_arn = data.terraform_remote_state.base.outputs.aws_buetow_org_certificate_arn + certificate_arn = data.terraform_remote_state.base.outputs.buetow_cloud_certificate_arn default_action { type = "forward" diff --git a/org-buetow-helper/main.tf b/org-buetow-helper/main.tf index 03320d7..789848a 100644 --- a/org-buetow-helper/main.tf +++ b/org-buetow-helper/main.tf @@ -55,9 +55,9 @@ resource "aws_instance" "bastion" { user_data = data.template_file.user_data.rendered } -resource "aws_route53_record" "bastion_aws_buetow_org" { - zone_id = data.terraform_remote_state.base.outputs.aws_buetow_org_zone_id - name = "bastion.aws.buetow.org" +resource "aws_route53_record" "bastion_buetow_cloud" { + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "bastion.buetow.cloud" type = "A" ttl = "300" records = [aws_instance.bastion.public_ip] diff --git a/org-buetow-nextcloud/data.tf b/org-buetow-nextcloud/data.tf deleted file mode 100644 index 17fb246..0000000 --- a/org-buetow-nextcloud/data.tf +++ /dev/null @@ -1,3 +0,0 @@ -data "aws_route53_zone" "zone" { - name = "aws.buetow.org." # Replace with your domain name -} diff --git a/org-buetow-nextcloud/lb.tf b/org-buetow-nextcloud/lb.tf index 73e0d8a..5aeb72b 100644 --- a/org-buetow-nextcloud/lb.tf +++ b/org-buetow-nextcloud/lb.tf @@ -1,6 +1,6 @@ resource "aws_route53_record" "a_record" { - zone_id = data.aws_route53_zone.zone.zone_id - name = "nextcloud.aws.buetow.org." + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "nextcloud.buetow.cloud." type = "A" alias { @@ -40,7 +40,7 @@ resource "aws_lb_listener_rule" "nextcloud_https_listener_rule" { condition { host_header { - values = ["nextcloud.aws.buetow.org"] + values = ["nextcloud.buetow.cloud"] } } } diff --git a/org-buetow-nextcloud/main.tf b/org-buetow-nextcloud/main.tf index 7fff623..c207c30 100644 --- a/org-buetow-nextcloud/main.tf +++ b/org-buetow-nextcloud/main.tf @@ -56,8 +56,8 @@ resource "aws_instance" "nextcloud" { } resource "aws_route53_record" "nextcloud_ec2_aws_buetow_org" { - zone_id = data.aws_route53_zone.zone.zone_id - name = "nextcloud-ec2.aws.buetow.org" # Replace with your desired subdomain or leave empty for root + zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id + name = "nextcloud-ec2.buetow.cloud" type = "A" ttl = "300" records = [aws_instance.nextcloud.public_ip] |