maix/pihole-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update:

Browse source
This commit is contained in:
maix0 2024-12-04 22:58:32 +01:00
parent 1a4c1f182d
commit 05565f5465
2 changed files with 74 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/example-system.flake.nix
View file

@ -27,19 +27,23 @@
}; };
}; };
outputs = { self, nixpkgs, linger, pihole, ... }: outputs = {
let self,
nixpkgs,
linger,
pihole,
...
}: let
system = "x86_64-linux"; system = "x86_64-linux";
# use x86_64 packages from nixpkgs # use x86_64 packages from nixpkgs
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in { in {
nixosConfigurations."nixos-example-system" = nixpkgs.lib.nixosSystem { nixosConfigurations."nixos-example-system" = nixpkgs.lib.nixosSystem {
# nixosSystem needs to know the system architecture # nixosSystem needs to know the system architecture
inherit system; inherit system;
modules = [ modules = [
# a small module for enabling nix flakes # a small module for enabling nix flakes
{ ... }: { ({...}: {
nix = { nix = {
packge = pkgs.nixFlakes; packge = pkgs.nixFlakes;
extraOptions = "experimental-features = nix-command flake"; extraOptions = "experimental-features = nix-command flake";
@ -48,7 +52,7 @@
# see https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html # see https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html
registry.nixpkgs.flake = nixpkgs; registry.nixpkgs.flake = nixpkgs;
}; };
} })
# some existing system & hardware configuration modules; it is assumed that a user named `pihole` is defined here # some existing system & hardware configuration modules; it is assumed that a user named `pihole` is defined here
# and that the user has sub-uids/gids configured (e.g. via the `users.users.pihole.subUidRanges/subGidRanges` options) # and that the user has sub-uids/gids configured (e.g. via the `users.users.pihole.subUidRanges/subGidRanges` options)
@ -60,7 +64,7 @@
pihole.nixosModules.${system}.default pihole.nixosModules.${system}.default
# in another module we can now configure the lingering behaviour (could also be part of ./configuration.nix) # in another module we can now configure the lingering behaviour (could also be part of ./configuration.nix)
{ ... }: { ({...}: {
# required for stable restarts of the Pi-hole container (try to remove it to see the warning from the pihole-flake) # required for stable restarts of the Pi-hole container (try to remove it to see the warning from the pihole-flake)
boot.cleanTmpDir = true; boot.cleanTmpDir = true;
@ -98,7 +102,7 @@
allowedTCPPorts = [5335 8080]; allowedTCPPorts = [5335 8080];
allowedUDPPorts = [5335]; allowedUDPPorts = [5335];
}; };
} })
]; ];
}; };
}; };

2
modules/pihole-container.factory.nix
View file

@ -327,7 +327,7 @@ in rec {
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [
{ assertion = length hostUserCfg.subUidRanges > 0 && length hostUserCfg.subGidRanges > 0; { assertion = length hostUserCfg.subUidRanges > 0 && length hostUserCfg.subGidRanges > 0 || hostUserCfg.autoSubUidGidRanges;
message = '' message = ''
The host user most have configured subUidRanges & subGidRanges as pihole is running in a rootless podman container. The host user most have configured subUidRanges & subGidRanges as pihole is running in a rootless podman container.
''; '';