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

flake(linger): add linger-flaker to allow the pihole-flake to manage user lingering

Browse source 
Systemd's user lingering feature seems to be necessary to run rootless podman if the executing user is not logged in.
See https://github.com/NixOS/nixpkgs/issues/138423
This commit is contained in:
Christopher Bacher 2022-10-28 18:51:18 +02:00
parent 5fb27f33b3
commit 428baed6cf
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -5,9 +5,11 @@
nixpkgs.url = "nixpkgs/nixpkgs-unstable"; nixpkgs.url = "nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
linger.url = "github:mindsbackyard/linger-flake";
}; };
outputs = { self, nixpkgs, flake-utils }: with flake-utils.lib; eachSystem (with system; [ x86_64-linux aarch64-linux ]) (curSystem: outputs = { self, nixpkgs, flake-utils, linger }: with flake-utils.lib; eachSystem (with system; [ x86_64-linux aarch64-linux ]) (curSystem:
let let
util = import ./lib/util.nix; util = import ./lib/util.nix;
pkgs = nixpkgs.legacyPackages.${curSystem}; pkgs = nixpkgs.legacyPackages.${curSystem};
@ -34,7 +36,11 @@
default = piholeImage; default = piholeImage;
}; };
nixosModules.default = (import ./modules/pihole-container.factory.nix) { piholeFlake = self; inherit util; }; nixosModules.default = (import ./modules/pihole-container.factory.nix) {
piholeFlake = self;
lingerFlake = linger;
inherit util;
};
devShells.default = let devShells.default = let
updatePiholeImageInfoScript = pkgs.writeShellScriptBin "update-pihole-image-info" '' updatePiholeImageInfoScript = pkgs.writeShellScriptBin "update-pihole-image-info" ''

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

@ -1,4 +1,4 @@
{ piholeFlake, util }: { config, pkgs, lib, ... }: with lib; with builtins; let { piholeFlake, lingerFlake, util }: { config, pkgs, lib, ... }: with lib; with builtins; let
inherit (util) collectAttrFragments accessValueOfFragment toEnvValue; inherit (util) collectAttrFragments accessValueOfFragment toEnvValue;
cfg = config.services.pihole; cfg = config.services.pihole;
@ -320,6 +320,11 @@ in rec {
Set it to "suppressWarning" if you manage lingering in a different way. Set it to "suppressWarning" if you manage lingering in a different way.
''); '');
services.linger = mkIf (cfg.hostConfig.enableLingeringForUser == true) {
enable = true;
users = [ cfg.hostConfig.user ];
};
systemd.services."pihole-rootless-container" = { systemd.services."pihole-rootless-container" = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];