Services are ready

modules/services/pi-hole.nix

@@ -3,7 +3,9 @@
 with lib;
 
 let
+  # Version tagging
   piholeVersion = "2026.02.0";
+  # Helper
   helper = import ./lib.nix { inherit config pkgs lib; };
   cfg = config.numbus.services.pi-hole;
 in
@@ -16,6 +18,12 @@ helper.mkPodmanService {
   dependencies = [ "network.target" "multi-user.target" ];
   dataDir = false;
   delaySec = 10;
+  generatedSecrets = {
+    PIHOLE_PASSWORD = "xkcdpass -n 10 -d -";
+  };
+  dirPermissions = [
+    "numbus-admin:users ${cfg.configDir}"
+  ];
 
 # Compose file good
   composeText = ''
@@ -29,24 +37,22 @@ helper.mkPodmanService {
           - "${cfg.port}:443/tcp"
           - "53:53/tcp"
           - "53:53/udp"
+        volumes:
+          - ${cfg.configDir}:/etc/pihole
         environment:
           PIHOLE_UID: '1000'
           PIHOLE_GID: '1000'
-          TZ: $TZ
-          FTLCONF_webserver_api_password: $FTLCONF_webserver_api_password
+          TZ: ${time.timeZone}
+          FTLCONF_webserver_api_password: $PIHOLE_PASSWORD
           FTLCONF_webserver_domain: ${cfg.subdomain}.${config.numbus.services.domain}
           FTLCONF_dns_upstreams: 9.9.9.9;149.112.112.112
           FTLCONF_dns_hosts: |
 ${lib.concatStringsSep "" (lib.mapAttrsToList (name: service:
   if builtins.isAttrs service && service ? enable && service.enable && service ? subdomain then
-    "            $HOME_SERVER_IP ${service.subdomain}.${config.numbus.services.domain}\n"
+    "            ${config.numbus.networking.ipAddress} ${service.subdomain}.${config.numbus.services.domain}\n"
   else
     ""
 ) config.numbus.services)}
-    # TODO : get revServers to work
-    #      FTLCONF_dns_revServers: |
-    #        true,$HOME_ROUTER_SUBNET,$HOME_ROUTER_IP,${config.numbus.services.domain}
-    #        true,$HOME_VPN_SUBNET,$HOME_VPN_IP,${config.numbus.services.domain}
           FTLCONF_dns_listeningMode: "BIND"
           FTLCONF_dns_domain_name: "${config.numbus.services.domain}"
           FTLCONF_dns_domain_local: "true"
@@ -54,8 +60,6 @@ ${lib.concatStringsSep "" (lib.mapAttrsToList (name: service:
           FTLCONF_ntp_ipv4_active: "false"
           FTLCONF_ntp_ipv6_active: "false"
           FTLCONF_ntp_sync_active: "false"
-        volumes:
-          - ${cfg.configDir}:/etc/pihole
         cap_add:
           - SYS_NICE
         restart: unless-stopped