diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2019-12-01 12:32:23 +0100 |
|---|---|---|
| committer | Lassulus <github@lassul.us> | 2019-12-07 19:56:49 +0100 |
| commit | 6c1c99d6b4f2321002123e3175a2a2263ed4bfb1 (patch) | |
| tree | 954bab1c7c8bbe2733ea6ec9c4ee2e4a0c12a5b4 | |
| parent | fdca231242fea0c71f8fcdeeebbd88d856cca071 (diff) | |
| download | nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.tar nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.tar.gz nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.tar.bz2 nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.tar.lz nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.tar.xz nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.tar.zst nixpkgs-6c1c99d6b4f2321002123e3175a2a2263ed4bfb1.zip | |
nixos/yggdrasil: fix for configFile option
The configFile was not being merged with the declarative configuration at runtime.
| -rw-r--r-- | nixos/modules/services/networking/yggdrasil.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 5d65f8e3413..9e675ecd6f4 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -12,11 +12,11 @@ let configFileProvided = (cfg.configFile != null); generateConfig = ( if configProvided && configFileProvided then - "${pkgs.jq}/bin/jq -s add /run/yggdrasil/configFile.json ${configAsFile}" + "${pkgs.jq}/bin/jq -s add ${configAsFile} ${cfg.configFile}" else if configProvided then "cat ${configAsFile}" else if configFileProvided then - "cat /run/yggdrasil/configFile.json" + "cat ${cfg.configFile}" else "${cfg.package}/bin/yggdrasil -genconf" ); @@ -147,7 +147,7 @@ in { RuntimeDirectory = "yggdrasil"; RuntimeDirectoryMode = "0700"; BindReadOnlyPaths = mkIf configFileProvided - [ "${cfg.configFile}:/run/yggdrasil/configFile.json" ]; + [ "${cfg.configFile}" ]; # TODO: as of yggdrasil 0.3.8 and systemd 243, yggdrasil fails # to set up the network adapter when DynamicUser is set. See |