From 81c3724ff73db39c8b3c5c7f04e576b8d9445ce3 Mon Sep 17 00:00:00 2001 From: Romain Paquet Date: Sat, 18 Oct 2025 18:50:42 +0200 Subject: [PATCH] migrate gitea from crocus to verbena --- infra/templates/turifer.dev.zone | 8 ++++++-- machines/crocus/configuration.nix | 1 - machines/flake-module.nix | 2 +- machines/verbena/configuration.nix | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/infra/templates/turifer.dev.zone b/infra/templates/turifer.dev.zone index 1dd4622..bee1da4 100644 --- a/infra/templates/turifer.dev.zone +++ b/infra/templates/turifer.dev.zone @@ -17,8 +17,12 @@ _submissions._tcp.turifer.dev. 3000 IN SRV 0 1 465 smtp.migadu.com. _imaps._tcp.turifer.dev. 3000 IN SRV 0 1 993 imap.migadu.com. _pop3s._tcp.turifer.dev. 3000 IN SRV 0 1 995 pop.migadu.com. -git.turifer.dev. 10800 IN A ${crocus_ipv4_address} -git.turifer.dev. 10800 IN AAAA ${crocus_ipv6_address} +%{ for addr in verbena_ipv4_addresses ~} +git.turifer.dev. 10800 IN A ${addr} +%{ endfor ~} +%{ for addr in verbena_ipv6_addresses ~} +git.turifer.dev. 10800 IN AAAA ${addr} +%{ endfor ~} %{ for addr in verbena_ipv4_addresses ~} buildbot.turifer.dev. 10800 IN A ${addr} diff --git a/machines/crocus/configuration.nix b/machines/crocus/configuration.nix index 1fdcd00..c457608 100644 --- a/machines/crocus/configuration.nix +++ b/machines/crocus/configuration.nix @@ -9,7 +9,6 @@ ../../modules/remote-builder.nix ../../modules/unbound.nix ../../modules/unbound-auth.nix - self.nixosModules.gitea self.inputs.srvos.nixosModules.server self.inputs.srvos.nixosModules.hardware-hetzner-cloud ]; diff --git a/machines/flake-module.nix b/machines/flake-module.nix index 29f71bd..e4280e5 100644 --- a/machines/flake-module.nix +++ b/machines/flake-module.nix @@ -54,7 +54,7 @@ }; internet = { - roles.default.machines.crocus = { + roles.default.machines.verbena = { settings.host = "git.turifer.dev"; }; }; diff --git a/machines/verbena/configuration.nix b/machines/verbena/configuration.nix index 5f2f366..0760a87 100644 --- a/machines/verbena/configuration.nix +++ b/machines/verbena/configuration.nix @@ -5,6 +5,7 @@ ../../modules/unbound.nix ../../modules/unbound-auth.nix self.nixosModules.nextcloud + self.nixosModules.gitea self.inputs.srvos.nixosModules.server ];