From 1a4551ff175b55f8a11989ef005d649651288c44 Mon Sep 17 00:00:00 2001 From: Christopher Bacher Date: Sun, 9 Oct 2022 19:57:58 +0200 Subject: [PATCH] module(pihole-container): rename module to `pihole` --- flake.nix | 2 +- modules/pihole-container.factory.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4878c22..50153e1 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ default = piholeImage; }; - nixosModules.default = import ./modules/pihole-container.factory.nix { piholeFlake = self; }; + nixosModules.default = (import ./modules/pihole-container.factory.nix) { piholeFlake = self; }; devShells.default = let updatePiholeImageInfoScript = pkgs.writeShellScriptBin "update-pihole-image-info" '' diff --git a/modules/pihole-container.factory.nix b/modules/pihole-container.factory.nix index 2d9fc26..77dc7ca 100644 --- a/modules/pihole-container.factory.nix +++ b/modules/pihole-container.factory.nix @@ -1,5 +1,5 @@ { piholeFlake }: { config, pkgs, lib, ... }: with lib; let - cfg = config.services.piholeRootlessContainer; + cfg = config.services.pihole; mkHostPortsOption = { service, publicDefaultPort }: { host-internal-port = mkOption { @@ -30,7 +30,7 @@ in { options = { - services.piholeRootlessContainer = { + services.pihole = { enable = mkEnableOption "PiHole as a rootless podman container"; hostConfig = { @@ -246,7 +246,7 @@ in { --rmi \ docker-archive:${self.packages.piholeImage} ''; - User = null; + User = admin; }; }; };