From b561c223aa14dc6db584318adc043573f627c6e4 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 14 Apr 2024 09:26:02 -0400
Subject: [PATCH] secrets: add separate withOwner/withGroup functions

---
 secrets/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/secrets/default.nix b/secrets/default.nix
index 9c3feb3..30c81c6 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -9,7 +9,9 @@ let
     { file = "${./.}/${name}"; };
   secrets = listToAttrs (map mkSecret (attrNames (import ./secrets.nix)));
 
-  withOwner = name: secret: secret // { owner = name; group = name; };
+  withOwnerGroup = name: secret: secret // { owner = name; group = name; };
+  withOwner = name: secret: secret // { owner = name; };
+  withGroup = name: secret: secret // { group = name; };
 in
 {
   options = {
@@ -30,14 +32,14 @@ in
           ;
       }
       (mkIf config.services.nginx.enable {
-        "inx.moe.pem" = withOwner "nginx" secrets."inx.moe.pem";
-        "inx.moe.key" = withOwner "nginx" secrets."inx.moe.key";
+        "inx.moe.pem" = withOwnerGroup "nginx" secrets."inx.moe.pem";
+        "inx.moe.key" = withOwnerGroup "nginx" secrets."inx.moe.key";
       })
       (mkIf config.services.vaultwarden.enable {
-        "vaultwarden" = withOwner "vaultwarden" secrets."vaultwarden";
+        "vaultwarden" = withOwnerGroup "vaultwarden" secrets."vaultwarden";
       })
       (mkIf config.services.freshrss.enable {
-        "freshrss" = withOwner "freshrss" secrets."freshrss";
+        "freshrss" = withOwnerGroup "freshrss" secrets."freshrss";
       })
     ];
   };