From 44947710deab01e0eb62f215d7f8963275dfc75c Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Mon, 8 Jul 2024 14:59:34 +0200 Subject: [PATCH 1/3] reduce usegalaxy.eu TTL --- dns.tf | 74 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/dns.tf b/dns.tf index 7215b33e..8267e219 100644 --- a/dns.tf +++ b/dns.tf @@ -7,7 +7,7 @@ resource "aws_route53_record" "usegalaxy-eu" { zone_id = var.zone_usegalaxy_eu name = "usegalaxy.eu" type = "A" - ttl = "7200" + ttl = "300" records = ["${var.sn06}"] } @@ -161,42 +161,42 @@ resource "aws_route53_record" "build-usegalaxy" { ## ZFS server #1 (all flash) resource "aws_route53_record" "ssds1-galaxyproject" { allow_overwrite = true - zone_id = var.zone_galaxyproject_eu - name = "zfs0f.galaxyproject.eu" - type = "A" - ttl = "7200" - records = ["10.5.68.239"] + zone_id = var.zone_galaxyproject_eu + name = "zfs0f.galaxyproject.eu" + type = "A" + ttl = "7200" + records = ["10.5.68.239"] } ## ZFS server #2 (spinning disks w/ flash cache) resource "aws_route53_record" "zfs1-galaxyproject" { allow_overwrite = true - zone_id = var.zone_galaxyproject_eu - name = "zfs1.galaxyproject.eu" - type = "A" - ttl = "7200" - records = ["10.5.68.238"] + zone_id = var.zone_galaxyproject_eu + name = "zfs1.galaxyproject.eu" + type = "A" + ttl = "7200" + records = ["10.5.68.238"] } ## ZFS server #3 (all flash) resource "aws_route53_record" "zfs2f-galaxyproject" { allow_overwrite = true - zone_id = var.zone_galaxyproject_eu - name = "zfs2f.galaxyproject.eu" - type = "A" - ttl = "7200" - records = ["10.5.68.236"] + zone_id = var.zone_galaxyproject_eu + name = "zfs2f.galaxyproject.eu" + type = "A" + ttl = "7200" + records = ["10.5.68.236"] #comment } ## ZFS server #4 (all flash) resource "aws_route53_record" "zfs3f-galaxyproject" { allow_overwrite = true - zone_id = var.zone_galaxyproject_eu - name = "zfs3f.galaxyproject.eu" - type = "A" - ttl = "7200" - records = ["10.5.68.235"] + zone_id = var.zone_galaxyproject_eu + name = "zfs3f.galaxyproject.eu" + type = "A" + ttl = "7200" + records = ["10.5.68.235"] } ## Previous central-manager @@ -269,10 +269,10 @@ resource "aws_route53_record" "it-subdomain-main" { # SPF and DMARC records resource "aws_route53_record" "usegalaxy_eu_dmarc_txt" { allow_overwrite = true - zone_id = var.zone_usegalaxy_eu - name = "_dmarc.usegalaxy.eu" - type = "TXT" - ttl = "300" + zone_id = var.zone_usegalaxy_eu + name = "_dmarc.usegalaxy.eu" + type = "TXT" + ttl = "300" records = [ "v=DMARC1;p=reject;pct=100;ruf=mailto:galaxy-ops@informatik.uni-freiburg.de;aspf=r" ] @@ -280,10 +280,10 @@ resource "aws_route53_record" "usegalaxy_eu_dmarc_txt" { resource "aws_route53_record" "usegalaxy_eu_spf_txt" { allow_overwrite = true - zone_id = var.zone_usegalaxy_eu - name = "" - type = "TXT" - ttl = "300" + zone_id = var.zone_usegalaxy_eu + name = "" + type = "TXT" + ttl = "300" records = [ "v=spf1 include:mailgun.org -all" ] @@ -291,10 +291,10 @@ resource "aws_route53_record" "usegalaxy_eu_spf_txt" { resource "aws_route53_record" "galaxyproject_eu_dmarc_txt" { allow_overwrite = true - zone_id = var.zone_galaxyproject_eu - name = "_dmarc.galaxyproject.eu" - type = "TXT" - ttl = "300" + zone_id = var.zone_galaxyproject_eu + name = "_dmarc.galaxyproject.eu" + type = "TXT" + ttl = "300" records = [ "v=DMARC1;p=reject;pct=100;ruf=mailto:galaxy-ops@informatik.uni-freiburg.de;aspf=r" ] @@ -302,10 +302,10 @@ resource "aws_route53_record" "galaxyproject_eu_dmarc_txt" { resource "aws_route53_record" "galaxyproject_eu_spf_txt" { allow_overwrite = true - zone_id = var.zone_galaxyproject_eu - name = "" - type = "TXT" - ttl = "300" + zone_id = var.zone_galaxyproject_eu + name = "" + type = "TXT" + ttl = "300" records = [ "v=spf1 -all" ] From df45dccd214c1ad98545fb3758902034fbe8147e Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Mon, 15 Jul 2024 09:48:02 +0200 Subject: [PATCH 2/3] no TTL reduction needed --- dns.tf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dns.tf b/dns.tf index 8267e219..d854b852 100644 --- a/dns.tf +++ b/dns.tf @@ -2,13 +2,17 @@ variable "sn06" { default = "132.230.223.239" } +variable "traefik" { + default = "132.230.103.37" +} + resource "aws_route53_record" "usegalaxy-eu" { allow_overwrite = true zone_id = var.zone_usegalaxy_eu name = "usegalaxy.eu" type = "A" - ttl = "300" - records = ["${var.sn06}"] + ttl = "7200" + records = ["${var.traefik}"] } resource "aws_route53_record" "galaxyproject-eu" { From 79f7e22eaf1cfc693213107edd5f1e55d6de6991 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 16 Jul 2024 16:57:01 +0200 Subject: [PATCH 3/3] reduce ttl --- dns.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dns.tf b/dns.tf index d854b852..e7ea9b05 100644 --- a/dns.tf +++ b/dns.tf @@ -11,7 +11,7 @@ resource "aws_route53_record" "usegalaxy-eu" { zone_id = var.zone_usegalaxy_eu name = "usegalaxy.eu" type = "A" - ttl = "7200" + ttl = "300" records = ["${var.traefik}"] }