diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | org-buetow-bastion/main.tf | 30 | ||||
| -rw-r--r-- | org-buetow-ecs/bagservice.tf | 4 | ||||
| -rw-r--r-- | org-buetow-ecs/vaultservice.tf | 2 |
4 files changed, 25 insertions, 15 deletions
@@ -1,8 +1,8 @@ apply: cd org-buetow-base && terraform apply -auto-approve - #cd org-buetow-bastion && terraform apply -auto-approve + cd org-buetow-bastion && terraform apply -auto-approve cd org-buetow-elb && terraform apply -auto-approve - cd org-buetow-ecs && terraform apply -auto-approve + #cd org-buetow-ecs && terraform apply -auto-approve #cd org-buetow-nextcloud && terraform apply -auto-approve destroy: cd org-buetow-nextcloud && terraform destroy -auto-approve diff --git a/org-buetow-bastion/main.tf b/org-buetow-bastion/main.tf index 1f37055..c407d24 100644 --- a/org-buetow-bastion/main.tf +++ b/org-buetow-bastion/main.tf @@ -17,11 +17,11 @@ resource "aws_key_pair" "id_rsa_pub" { } resource "aws_instance" "bastion" { - ami = "ami-024f768332f080c5e" # Amazon Linux 2023 - instance_type = "t2.micro" - key_name = aws_key_pair.id_rsa_pub.key_name - subnet_id = data.terraform_remote_state.base.outputs.public_subnet_a_id - #ipv6_address_count = 1 + ami = "ami-024f768332f080c5e" # Amazon Linux 2023 + instance_type = "t2.micro" + key_name = aws_key_pair.id_rsa_pub.key_name + subnet_id = data.terraform_remote_state.base.outputs.public_subnet_a_id + ipv6_address_count = 1 #ipv6_addresses = [data.terraform_remote_state.base.public_subnet_a_ipv6_cidr_block] vpc_security_group_ids = [ @@ -37,18 +37,28 @@ resource "aws_instance" "bastion" { } } -resource "aws_eip" "bastion" { - instance = aws_instance.bastion.id +resource "aws_route53_record" "a_record" { + 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] } -resource "aws_route53_record" "bastion_buetow_cloud" { +resource "aws_route53_record" "aaaa_record" { zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id name = "bastion.buetow.cloud" - type = "A" + type = "AAAA" ttl = "300" - records = [aws_eip.bastion.public_ip] + records = aws_instance.bastion.ipv6_addresses } +# For elastic IP + +#resource "aws_eip" "bastion" { +# instance = aws_instance.bastion.id +#} + #resource "aws_route53_record" "bastion_ec2_buetow_cloud" { # zone_id = data.terraform_remote_state.base.outputs.buetow_cloud_zone_id # name = "bastion-ec2.buetow.cloud" diff --git a/org-buetow-ecs/bagservice.tf b/org-buetow-ecs/bagservice.tf index 58ac113..38de3ee 100644 --- a/org-buetow-ecs/bagservice.tf +++ b/org-buetow-ecs/bagservice.tf @@ -34,7 +34,7 @@ resource "aws_ecs_task_definition" "bag" { name = "bag-db-efs-volume" efs_volume_configuration { file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id - root_directory = "/ecs/wallabag/data/db" + root_directory = "/ecs/bag/data/db" } } @@ -42,7 +42,7 @@ resource "aws_ecs_task_definition" "bag" { name = "bag-assets-efs-volume" efs_volume_configuration { file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id - root_directory = "/ecs/wallabag/data/assets" + root_directory = "/ecs/bag/data/assets" } } diff --git a/org-buetow-ecs/vaultservice.tf b/org-buetow-ecs/vaultservice.tf index 938c744..f566d94 100644 --- a/org-buetow-ecs/vaultservice.tf +++ b/org-buetow-ecs/vaultservice.tf @@ -34,7 +34,7 @@ resource "aws_ecs_task_definition" "vault" { name = "vault-data-efs-volume" efs_volume_configuration { file_system_id = data.terraform_remote_state.base.outputs.self_hosted_services_efs_id - root_directory = "/ecs/vaultwarden/data" + root_directory = "/ecs/vault/data" } } |