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

Update zerotierone.nix per input

Browse Source 
Changed `services.zerotierone.localConf` default value to `null` and type to `nullOr attrs` per input.

Changed `systemd` preStart script to delete
 `/var/lib/zerotier-one/local.conf` when it is a symlink, and rename when it is an actual file, then only create a symlink to the nix store when `services.zerotierone.localConf` is not null.
This commit is contained in:
Yonghan Ching 庄勇翰 2023-12-18 17:00:14 -06:00 committed by Emery Hemingway
parent b233faab82
commit 8af401d3cf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixos/modules/services/networking/zerotierone.nix
View File

@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.zerotierone;
conf = pkgs.writeText "zt-local.conf" (builtins.toJSON cfg.localConf);
localConfFile = pkgs.writeText "zt-local.conf" (builtins.toJSON cfg.localConf);
localConfFilePath = "/var/lib/zerotier-one/local.conf";
in
{
@ -32,16 +32,16 @@ in
options.services.zerotierone.package = mkPackageOption pkgs "zerotierone" { };
options.services.zerotierone.localConf = mkOption {
default = { };
default = null;
description = mdDoc ''
Configuration to be written to the zerotier JSON-based local.conf.
The configuration will be symlinked to /var/lib/zerotier-one/local.conf at build time.
Optional configuration to be written to the Zerotier JSON-based local.conf.
If set, the configuration will be symlinked to `/var/lib/zerotier-one/local.conf` at build time.
To understand the configuration format, refer to https://docs.zerotier.com/config/#local-configuration-options.
'';
'';
example = {
settings.allowTcpFallbackRelay = false;
};
type = types.attrs;
type = types.nullOr types.attrs;
};
config = mkIf cfg.enable {
@ -61,11 +61,14 @@ in
'' + (concatMapStrings (netId: ''
touch "/var/lib/zerotier-one/networks.d/${netId}.conf"
'') cfg.joinNetworks) + ''
if [ -e "${localConfFilePath}" ]
if [ -L "${localConfFilePath}" ]
then
rm ${localConfFilePath}
elif [ -f "${localConfFilePath}" ]
mv ${localConfFilePath} ${localConfFilePath}.bak
fi
ln -s ${conf} ${localConfFilePath}
'' + optionalString (cfg.localConf != null) ''
ln -s ${localConfFile} ${localConfFilePath}
'';
serviceConfig = {