colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #289270 from Mic92/nixos-tinc

Browse Source 
nixos/tinc: fix user to not include . in its name
This commit is contained in:
Jörg Thalheim 2024-04-09 19:43:48 +02:00 committed by GitHub
commit fb158384bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/networking/tinc.nix
View File

@ -348,7 +348,7 @@ in
(flip mapAttrsToList cfg.networks (network: data: (flip mapAttrsToList cfg.networks (network: data:
flip mapAttrs' data.hosts (host: text: nameValuePair flip mapAttrs' data.hosts (host: text: nameValuePair
("tinc/${network}/hosts/${host}") ("tinc/${network}/hosts/${host}")
({ mode = "0644"; user = "tinc.${network}"; inherit text; }) ({ mode = "0644"; user = "tinc-${network}"; inherit text; })
) // { ) // {
"tinc/${network}/tinc.conf" = { "tinc/${network}/tinc.conf" = {
mode = "0444"; mode = "0444";
@ -375,13 +375,13 @@ in
Restart = "always"; Restart = "always";
RestartSec = "3"; RestartSec = "3";
ExecReload = mkIf (versionAtLeast version "1.1pre") "${data.package}/bin/tinc -n ${network} reload"; ExecReload = mkIf (versionAtLeast version "1.1pre") "${data.package}/bin/tinc -n ${network} reload";
ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; ExecStart = "${data.package}/bin/tincd -D -U tinc-${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}";
}; };
preStart = '' preStart = ''
mkdir -p /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/hosts
chown tinc.${network} /etc/tinc/${network}/hosts chown tinc-${network} /etc/tinc/${network}/hosts
mkdir -p /etc/tinc/${network}/invitations mkdir -p /etc/tinc/${network}/invitations
chown tinc.${network} /etc/tinc/${network}/invitations chown tinc-${network} /etc/tinc/${network}/invitations
# Determine how we should generate our keys # Determine how we should generate our keys
if type tinc >/dev/null 2>&1; then if type tinc >/dev/null 2>&1; then
@ -420,14 +420,14 @@ in
in [ cli-wrappers ]; in [ cli-wrappers ];
users.users = flip mapAttrs' cfg.networks (network: _: users.users = flip mapAttrs' cfg.networks (network: _:
nameValuePair ("tinc.${network}") ({ nameValuePair ("tinc-${network}") ({
description = "Tinc daemon user for ${network}"; description = "Tinc daemon user for ${network}";
isSystemUser = true; isSystemUser = true;
group = "tinc.${network}"; group = "tinc-${network}";
}) })
); );
users.groups = flip mapAttrs' cfg.networks (network: _: users.groups = flip mapAttrs' cfg.networks (network: _:
nameValuePair "tinc.${network}" {} nameValuePair "tinc-${network}" {}
); );
}); });