Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fdca231242fe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c1c99d6b4f2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 7, 2019

  1. nixos/yggdrasil: fix for configFile option 

    The configFile was not being merged with the declarative configuration at
runtime.
    @ehmry @Lassulus
    ehmry authored and Lassulus committed Dec 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6c1c99d View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 nixos/modules/services/networking/yggdrasil.nix
6 changes: 3 additions & 3 deletions nixos/modules/services/networking/yggdrasil.nix
View file
Original file line number Diff line number Diff line change
@@ -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