From a6c88820038515ad4438593c14703f9d94ed00c4 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 28 Oct 2026 14:15:17 +0100 Subject: {hosts/server2,modules/nextcloud}: Remove adminPassFile This is no longer a supported option and admin provisioning should be done via the nextcloud cli now. --- hosts/by-name/server2/configuration.nix | 1 - hosts/by-name/server2/secrets/nextcloud/adminpassFile.age | 14 -------------- modules/vhack/ne/nextcloud/module.nix | 14 -------------- 3 files changed, 29 deletions(-) delete mode 100644 hosts/by-name/server2/secrets/nextcloud/adminpassFile.age diff --git a/hosts/by-name/server2/configuration.nix b/hosts/by-name/server2/configuration.nix index 8d19945..ba08d87 100644 --- a/hosts/by-name/server2/configuration.nix +++ b/hosts/by-name/server2/configuration.nix @@ -145,7 +145,6 @@ enable = true; package = pkgs.nextcloud33; hostname = "nextcloud.vhack.eu"; - adminpassFile = ./secrets/nextcloud/adminpassFile.age; }; nginx = { diff --git a/hosts/by-name/server2/secrets/nextcloud/adminpassFile.age b/hosts/by-name/server2/secrets/nextcloud/adminpassFile.age deleted file mode 100644 index 2b831f3..0000000 --- a/hosts/by-name/server2/secrets/nextcloud/adminpassFile.age +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxanRqM3pOT29DWitxUERF -RjRURVZUWGpOSzFoZVpCSzJIN0RGZDAzWEZzCkczaExmOGgxQUQwV2NleUdHMXBB -eTZLZXpGZE1hcXBhWWhVcEQ5OFBQWUkKLT4gWDI1NTE5IG5DVmlEaDhTWk9xaWs2 -TnF1K1ZtK2UyeDgvOEFlbVUzc0V1VnZoSmFobEkKczNrSGdwZEVxVFNES3dzcVgy -SmRYNS9WR29mNGNCQW84bHZsZzNTRGZCQQotPiBzc2gtZWQyNTUxOSBYUG94RFEg -Y2ZQd25odWRRbUdqM3gxMzBrQ1Y3UjRwQ0JsRldtblRaYnVKWHZud2p5awpZdkNm -bk82RVVId2tsOXlKb2psa25pNFpManN4bjQwblBWUWdGaWxxQ1B3Ci0+ICNqaTBs -KE8tZ3JlYXNlIE1KZGEgNzAKSGNMSlRGTzN5d3ZXcFZNTkxlZHprVlVQTzJ4K2Vp -MG1YMTFHRmV6L2tMMGUKLS0tIE44WHBBZk1qcmRnK2lPczdiQ294SW50UFdrUHUw -d0EreHNod29LL2pjd2cKw1rpd83gONZaOiV5lQ+QOtIZzoIkaOvRD/8avsbeFsP7 -AB/jiOfOwYJ0DVbNMjopwnzpcAFsLWs6Gg0wQhjNsl349TIcTAS0xLTJYTm8DwQy -FmzftPMHAuJ/IPGzb3hQOFqpuFAPkunfiOgZ/N7N/+LLNMC5NxkkSH8m8gDBCCk= ------END AGE ENCRYPTED FILE----- diff --git a/modules/vhack/ne/nextcloud/module.nix b/modules/vhack/ne/nextcloud/module.nix index ed51936..d28342b 100644 --- a/modules/vhack/ne/nextcloud/module.nix +++ b/modules/vhack/ne/nextcloud/module.nix @@ -17,10 +17,6 @@ in { type = lib.types.str; description = "The nextcloud hostname (fqdn)"; }; - adminpassFile = lib.mkOption { - type = lib.types.path; - description = "The age encrypted admin password file"; - }; }; config = lib.mkIf cfg.enable { @@ -31,14 +27,6 @@ in { "/var/lib/nextcloud" ]; }; - age.secrets = { - adminpassFile = { - file = cfg.adminpassFile; - mode = "0700"; - owner = "nextcloud"; - group = "nextcloud"; - }; - }; services = { nextcloud = { @@ -58,8 +46,6 @@ in { extraAppsEnable = true; configureRedis = true; config = { - adminuser = "admin"; - adminpassFile = config.age.secrets.adminpassFile.path; dbname = "nextcloud"; dbuser = "nextcloud"; dbtype = "pgsql"; -- cgit v1.3.1