From d9a2fb13dd15bf5f849e91dbf3c43361356186a9 Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Sun, 2 Oct 2022 17:44:35 +0200
Subject: [PATCH] finished masto

---
 nixos/hosts/hades/mastodon/configuration.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/hosts/hades/mastodon/configuration.nix b/nixos/hosts/hades/mastodon/configuration.nix
index 20d39db..f352b05 100644
--- a/nixos/hosts/hades/mastodon/configuration.nix
+++ b/nixos/hosts/hades/mastodon/configuration.nix
@@ -1,6 +1,9 @@
 { config, pkgs, lib, ... }:
-let vs = config.vault-secrets.secrets;
-in {
+let
+  vs = config.vault-secrets.secrets;
+  cfg = config.services.mastodon;
+in
+{
   system.stateVersion = "21.05";
   # Use DHCP with static leases
   networking.interfaces.eth0.useDHCP = true;
@@ -16,6 +19,8 @@ in {
 
   vault-secrets.secrets.mastodon = {
     services = [ "mastodon-init-dirs" "mastodon" ];
+    user = cfg.user;
+    group = cfg.group;
   };
 
   # Append the init-dirs script to add AWS/Minio secrets
@@ -87,6 +92,7 @@ in {
     };
   };
 
-  networking.firewall = let cfg = config.services.mastodon;
-  in { allowedTCPPorts = [ cfg.streamingPort cfg.webPort ]; };
+  networking.firewall =
+    let cfg = config.services.mastodon;
+    in { allowedTCPPorts = [ cfg.streamingPort cfg.webPort ]; };
 }