diff --git a/.locksverify b/.locksverify new file mode 100644 index 0000000..e69de29 diff --git a/secrets/default.nix b/secrets/default.nix index 99356d8..b2ffdcc 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,40 +1,46 @@ -{config, ...}: let +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + inherit (config.niksos) server; + serviceUser = x: config.systemd.services.${x}.serviceConfig.User; + abstrServiceUser = x: config.services.${x}.user; + abstrServiceGroup = x: config.services.${x}.group; in { age.secrets = { - transferSh = { - file = ./transfer-sh.age; - owner = "jsw"; - }; - dcbot = { - file = ./dcbot.age; - owner = - if config.niksos.server - then serviceUser "dcbot" # "dcbot" doesn't exist on e.g laptop. - else "root"; - }; - bread-dcbot = { - file = ./bread-dcbot.age; - owner = - if config.niksos.server - then serviceUser "bread-dcbot" # "dcbot" doesn't exist on e.g laptop. - else "root"; - }; password.file = ./password.age; - matrix-registration = { - file = ./matrix-registration.age; - owner = - if config.niksos.server - then config.services.matrix-continuwuity.user - else "root"; + + # NOTE: server things + dcbot = mkIf server { + file = ./dcbot.age; + owner = serviceUser "dcbot"; # }; - cloudflare-acme.file = ./cloudflare-acme.age; - mail-admin = { - # owner = #FIXME: revert when stopped using docker for stalwart. - # if config.niksos.server - # then serviceUser "stalwart-mail" - # else "root"; + bread-dcbot = mkIf server { + file = ./bread-dcbot.age; + owner = "bread-dcbot"; + }; + matrix-registration = mkIf server { + file = ./matrix-registration.age; + owner = abstrServiceUser "matrix-continuwuity"; + }; + mail-admin = mkIf server { + # owner = serviceUser "stalwart-mail"; #FIXME: revert when stopped using docker for stalwart. file = ./mail-admin.age; }; + zitadel-key = mkIf server { + file = ./zitadel-key.age; + owner = abstrServiceUser "zitadel"; + }; + forgejo-mailpass = mkIf server { + file = ./forgejo-mailpass.age; + owner = abstrServiceUser "forgejo"; + }; + immich-oidc = mkIf server { + file = ./immich-oidc.age; + owner = abstrServiceUser "immich"; + }; }; } diff --git a/secrets/forgejo-mailpass.age b/secrets/forgejo-mailpass.age new file mode 100644 index 0000000..eed7f49 --- /dev/null +++ b/secrets/forgejo-mailpass.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 GQzYWA j5yj1cq9FbYSW767zObF4RbJ7Jhx0818BryvWGWwnSw +LelnyL/SIat9BKl4hsz0n6rl8xPgchk+nQmfb1xkXkU +-> ssh-ed25519 MfR7VA sVGSrPd10dOdnDNROMGW1gLuczlVwMLpymgx6+cCJRE +8vf0ubRiRUWfc6Mgt0bNq99SgrY4pYJ0f4BHVRn+lYU +-> ssh-ed25519 +cvRTg VK4bHTmw+Oz7JLdP0zEbfKTjNUBtVxcbHX4zyZrQxx4 +1BjqL4TuNJO8VH9c2MT24ZlGz8ifniUZaK4AkK4VjM4 +-> ssh-ed25519 WCPLrA lD5KmpPXdvmTGMXMhye/ivnkbb0+XRCpUA4i6JBsK2w +0LKCxV8vSewkNOLJa+xEZp4w+qIRAVezv37g6hExpb0 +-> ssh-ed25519 7/ziYw Yq6qqosp/yOekCO7NBpNTJQVv8NciaSLiDFNuLaOjyA +8Joor9/H+ExdOQBavTMH13SI9MZgBKQQA2HPxKAF9uU +-> ssh-ed25519 VQy60Q /+R2djdRbYoWq1GzMFSj+gwXGf085axPJHOa0tIeFTs +dBVQQ7yucfpbmeR82Fp6MR1/IiQun3bqNVCm9qegL2g +--- fHjHEH5JtSZnKnJFC/KDQELHDwVsExA5aeuKN7DvL1M +AH? 'ahǒP>"/yRƄ!I= G4ٺ^iX}a: \ No newline at end of file diff --git a/secrets/immich-oidc.age b/secrets/immich-oidc.age new file mode 100644 index 0000000..11c301f --- /dev/null +++ b/secrets/immich-oidc.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 GQzYWA MbczMCSPu7pJru1rmOsFuloCYLKlh7koC5drXcKlwiw +ZghUrcs7YT3ciwqOkrPDEzlZe3qN9ypBw3xRGYWNPaY +-> ssh-ed25519 MfR7VA KB6RE2QZ//Z6xoyQC502dJeg79rYXFJJdOwV+c6tOWo +e1zIz2nsV9JbBaadTnONrPLI5Ztyv9vf4Ewzd9uSHnU +-> ssh-ed25519 +cvRTg GntHLoUwpIrxm3FcVw+Bavaq6kLaZpVdTRLoMMVfpAY +abE1ZkhS39vylBg8bZ5K3vgnXr70Vbk1bLCKsCFlUvU +-> ssh-ed25519 WCPLrA +/GlB5CbM/1FwI5JE63DJVUChADjJfD3jJY3Y2KmXEU +pPqBhV49/wg/hWffFm2XFRGC9p1nQ57tj1YK7pPkQ3U +-> ssh-ed25519 7/ziYw lxlJVNMIqfoMPj6VGTt2V4PxFi+6WRMfOYcv1hpEMkM +kd8CI7RECJA5uPJu33D61OEnqWwZuNQ6VmYLqXew6gc +-> ssh-ed25519 VQy60Q YSgYVPPN7QutKhbv6/1vmoRnh14KXs0g2k9qxKuvQ2U +FL3fImxWoBeHrCLd+jp/a1oRd/Acgi6sV/g40dCRrTA +--- TipdjwDPkRxiV/R1FUYCm/tcD6M+XEaZhQjrzwMxiuA +E%ZDTs,5 jLOzﻸT _Hn*xQ7$Cv`Wqt%N6 5 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2db3699..df90563 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -18,6 +18,8 @@ in { "dcbot.age".publicKeys = keys; "bread-dcbot.age".publicKeys = keys; "matrix-registration.age".publicKeys = keys; - "cloudflare-acme.age".publicKeys = keys; "mail-admin.age".publicKeys = keys; + "zitadel-key.age".publicKeys = keys; + "forgejo-mailpass.age".publicKeys = keys; + "immich-oidc.age".publicKeys = keys; } diff --git a/secrets/zitadel-key.age b/secrets/zitadel-key.age new file mode 100644 index 0000000..f5751e4 --- /dev/null +++ b/secrets/zitadel-key.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 GQzYWA YUoGdx518q+GhqnOVeuHxWE4//2KgVTXJCu4ULUkly8 +XIxa/FaGC5XBcrsvhZq5rOgX5vNDfFvcDCsamN7vHJ8 +-> ssh-ed25519 MfR7VA 9btD5WmqZdQ54uJYVNwU3Z5DBIlACbYfqGe1wPZwd30 +QecwT2R+BkQrGmorYcMuXHyy/TG7JjBdH2fp3W9zCBU +-> ssh-ed25519 +cvRTg UZnkgS+9oRLgEI/vdLFIAPbUG4V5iAuB4Z74D/quXzE +vxWJZI/SZKH1j8bnI4xC8+TIIANqMOkIDej+BWzDJwE +-> ssh-ed25519 WCPLrA OVnublQtCOFFo7+vcKGmCY3B3FkvLvQ6GaU7xMx8uQY +PuMamZqF3vCqgmpcTGQinIdbjOOpHtrmKfOXlL924Rk +-> ssh-ed25519 7/ziYw nYxpO5kaGDOyGUEFxryEhT0XqWf0Oc1RgprYaPjC33c +UseYaBeWvetviCf1FHncVNko86ji+GX9AdyDic2A1Og +-> ssh-ed25519 VQy60Q ok1oP3f7nWBd/6DyJFDnsv/Lb2/bwHY0cvmHI386IFM +t5rIZBUz5jav6tUo01ASMzYtHoW4+cKBZ2lzmxSI7IA +--- NZ9UXYlEIcw3VPFqDswXhSecW1zqcCeKivJoHC1zKA8 +JqU0]D_Տz =1׶S!-.t="緿e