diff --git a/terraform/gandi.nix b/terraform/gandi.nix index ee72816..c4a7407 100644 --- a/terraform/gandi.nix +++ b/terraform/gandi.nix @@ -56,43 +56,43 @@ in }) (lib.flatten records)); in forkosRecords ([ - # (record "@" 3600 "A" ["163.172.69.160"]) - (record "@" 3600 "AAAA" ["2001:bc8:38ee:100:1000::20"]) + # (record "@" 300 "A" ["163.172.69.160"]) + (record "@" 300 "AAAA" ["2001:bc8:38ee:100:1000::20"]) - (dualProxyRecords "bagel-box.infra" 3600 "AAAA" ["2001:bc8:38ee:100:100::1"]) - (dualProxyRecords "gerrit01.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::10"]) - (dualProxyRecords "meta01.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::20"]) - (dualProxyRecords "fodwatch.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::30"]) + (dualProxyRecords "bagel-box.infra" 300 "AAAA" ["2001:bc8:38ee:100:100::1"]) + (dualProxyRecords "gerrit01.infra" 300 "AAAA" ["2001:bc8:38ee:100:1000::10"]) + (dualProxyRecords "meta01.infra" 300 "AAAA" ["2001:bc8:38ee:100:1000::20"]) + (dualProxyRecords "fodwatch.infra" 300 "AAAA" ["2001:bc8:38ee:100:1000::30"]) # git.infra.forkos.org exposes opensshd - (dualProxyRecords "git.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::41"]) + (dualProxyRecords "git.infra" 300 "AAAA" ["2001:bc8:38ee:100:1000::41"]) # git.p.forkos.org exposes forgejo ssh server. - (proxyRecords "git.p" 3600 "AAAA" ["2001:bc8:38ee:100:1000::40"]) - (dualProxyRecords "buildbot.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::50"]) - (dualProxyRecords "public01.infra" 3600 "AAAA" ["2001:bc8:38ee:100:1000::60"]) + (proxyRecords "git.p" 300 "AAAA" ["2001:bc8:38ee:100:1000::40"]) + (dualProxyRecords "buildbot.infra" 300 "AAAA" ["2001:bc8:38ee:100:1000::50"]) + (dualProxyRecords "public01.infra" 300 "AAAA" ["2001:bc8:38ee:100:1000::60"]) - (record "cl" 3600 "CNAME" ["gerrit01.infra.p"]) - (record "fodwatch" 3600 "CNAME" ["fodwatch.infra.p"]) + (record "cl" 300 "CNAME" ["gerrit01.infra.p"]) + (record "fodwatch" 300 "CNAME" ["fodwatch.infra.p"]) # git.p.forkos.org is the proxy variant of the Forgejo server. - (record "git" 3600 "CNAME" ["git.p"]) - (record "netbox" 3600 "CNAME" ["meta01.infra.p"]) - (record "amqp" 3600 "CNAME" ["bagel-box.infra.p"]) - (record "grafana" 3600 "CNAME" ["meta01.infra.p"]) - (record "hydra" 3600 "CNAME" ["build-coord.wob01.infra.p"]) - (record "loki" 3600 "CNAME" ["meta01.infra.p"]) - (record "mimir" 3600 "CNAME" ["meta01.infra.p"]) - (record "matrix" 3600 "CNAME" ["meta01.infra.p"]) - (record "alerts" 3600 "CNAME" ["meta01.infra.p"]) - (record "buildbot" 3600 "CNAME" ["buildbot.infra.p"]) - (record "b" 3600 "CNAME" ["public01.infra.p"]) - (record "postgres" 3600 "CNAME" ["bagel-box.infra.p"]) + (record "git" 300 "CNAME" ["git.p"]) + (record "netbox" 300 "CNAME" ["meta01.infra.p"]) + (record "amqp" 300 "CNAME" ["bagel-box.infra.p"]) + (record "grafana" 300 "CNAME" ["meta01.infra.p"]) + (record "hydra" 300 "CNAME" ["build-coord.wob01.infra.p"]) + (record "loki" 300 "CNAME" ["meta01.infra.p"]) + (record "mimir" 300 "CNAME" ["meta01.infra.p"]) + (record "matrix" 300 "CNAME" ["meta01.infra.p"]) + (record "alerts" 300 "CNAME" ["meta01.infra.p"]) + (record "buildbot" 300 "CNAME" ["buildbot.infra.p"]) + (record "b" 300 "CNAME" ["public01.infra.p"]) + (record "postgres" 300 "CNAME" ["bagel-box.infra.p"]) # S3 in delroth's basement - (record "cache" 3600 "CNAME" ["smol.delroth.net."]) + (record "cache" 300 "CNAME" ["smol.delroth.net."]) - (record "vpn-gw.wob01.infra" 3600 "AAAA" [ "2a01:584:11::2" ]) + (record "vpn-gw.wob01.infra" 300 "AAAA" [ "2a01:584:11::2" ]) - (dualProxyRecords "build-coord.wob01.infra" 3600 "AAAA" [ "2a01:584:11::1:11" ]) + (dualProxyRecords "build-coord.wob01.infra" 300 "AAAA" [ "2a01:584:11::1:11" ]) # TODO: do not hardcode, just reuse the Colmena hive module outputs to generate all the required details. - ] ++ map (index: record "builder-${toString index}.wob01.infra" 3600 "AAAA" [ "2a01:584:11::1:${toString index}" ]) (genList lib.id 11)); + ] ++ map (index: record "builder-${toString index}.wob01.infra" 300 "AAAA" [ "2a01:584:11::1:${toString index}" ]) (genList lib.id 11)); }; }