From 838ff7ed6b8ab881bb3aa09cb1557a752975a22d Mon Sep 17 00:00:00 2001
From: Romain Paquet <rpqt@rpqt.fr>
Date: Sat, 18 Oct 2025 18:50:42 +0200
Subject: [PATCH] migrate nextcloud from crocus to verbena

---
 infra/dns.tf                               | 25 ++++++++++------------
 machines/crocus/configuration.nix          |  1 -
 machines/verbena/configuration.nix         |  1 +
 modules/flake-module.nix                   |  1 +
 {machines/crocus => modules}/nextcloud.nix |  5 +++--
 5 files changed, 16 insertions(+), 17 deletions(-)
 rename {machines/crocus => modules}/nextcloud.nix (95%)

diff --git a/infra/dns.tf b/infra/dns.tf
index 543a35f..c56ce73 100644
--- a/infra/dns.tf
+++ b/infra/dns.tf
@@ -23,23 +23,20 @@ resource "gandi_livedns_record" "rpqt_fr_radicle_aaaa" {
 }
 
 resource "gandi_livedns_record" "rpqt_fr_cloud_a" {
-  zone = data.gandi_livedns_domain.rpqt_fr.id
-  name = "cloud"
-  type = "A"
-  ttl  = 10800
-  values = [
-    hcloud_server.crocus_server.ipv4_address,
-  ]
+  zone   = data.gandi_livedns_domain.rpqt_fr.id
+  name   = "cloud"
+  type   = "A"
+  ttl    = 10800
+  values = local.verbena_ipv4_addresses
 }
 
 resource "gandi_livedns_record" "rpqt_fr_cloud_aaaa" {
-  zone = data.gandi_livedns_domain.rpqt_fr.id
-  name = "cloud"
-  type = "AAAA"
-  ttl  = 10800
-  values = [
-    hcloud_server.crocus_server.ipv6_address,
-  ]
+  zone   = data.gandi_livedns_domain.rpqt_fr.id
+  name   = "cloud"
+  type   = "AAAA"
+  ttl    = 10800
+  values = local.verbena_ipv6_addresses
+}
 }
 
 data "ovh_vps" "verbena_vps" {
diff --git a/machines/crocus/configuration.nix b/machines/crocus/configuration.nix
index 1747b9f..1fdcd00 100644
--- a/machines/crocus/configuration.nix
+++ b/machines/crocus/configuration.nix
@@ -7,7 +7,6 @@
     ./radicle.nix
     self.nixosModules.nix-defaults
     ../../modules/remote-builder.nix
-    ./nextcloud.nix
     ../../modules/unbound.nix
     ../../modules/unbound-auth.nix
     self.nixosModules.gitea
diff --git a/machines/verbena/configuration.nix b/machines/verbena/configuration.nix
index 7b01303..5f2f366 100644
--- a/machines/verbena/configuration.nix
+++ b/machines/verbena/configuration.nix
@@ -4,6 +4,7 @@
     self.nixosModules.nix-defaults
     ../../modules/unbound.nix
     ../../modules/unbound-auth.nix
+    self.nixosModules.nextcloud
 
     self.inputs.srvos.nixosModules.server
   ];
diff --git a/modules/flake-module.nix b/modules/flake-module.nix
index 74f27fe..78a3d3b 100644
--- a/modules/flake-module.nix
+++ b/modules/flake-module.nix
@@ -13,6 +13,7 @@
     tailscale.imports = [ ./tailscale.nix ];
     user-rpqt.imports = [ ./user-rpqt.nix ];
     hardened-ssh-server.imports = [ ./hardened-ssh-server.nix ];
+    nextcloud.imports = [ ./nextcloud.nix ];
 
     common.imports = [
       {
diff --git a/machines/crocus/nextcloud.nix b/modules/nextcloud.nix
similarity index 95%
rename from machines/crocus/nextcloud.nix
rename to modules/nextcloud.nix
index a07c945..2404806 100644
--- a/machines/crocus/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -4,13 +4,14 @@ let
 in
 {
   imports = [
-    ../../modules/acme-home.nix
+    ./acme-home.nix
   ];
 
   services.nextcloud = {
     enable = true;
     hostName = fqdn;
     https = true;
+    package = pkgs.nextcloud32;
     config = {
       dbtype = "pgsql";
       dbuser = "nextcloud";
@@ -33,7 +34,7 @@ in
     };
     extraAppsEnable = true;
     extraApps = {
-      inherit (pkgs.nextcloud31Packages.apps) tasks;
+      # inherit (pkgs.nextcloud32Packages.apps) tasks;
     };
   };