diff options
author | Emery Hemingway <ehmry@posteo.net> | 2019-11-16 12:57:56 +0100 |
---|---|---|
committer | Emery Hemingway <ehmry@posteo.net> | 2019-11-16 16:36:17 +0100 |
commit | 7a1b4d19648a2975244244a6983d7c60e245dc46 (patch) | |
tree | 5546bb1c82d7fa820d0eb11c67d51235e5c2955d | |
parent | 5af5b19bc7c7e59d30a61840c0c8a576e524466c (diff) | |
download | nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.tar nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.tar.gz nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.tar.bz2 nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.tar.lz nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.tar.xz nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.tar.zst nixpkgs-7a1b4d19648a2975244244a6983d7c60e245dc46.zip |
nixos/yggdrasil: remove /etc effects
Use of the /etc directory should be avoided for software without hardcoded configuration paths.
-rw-r--r-- | nixos/modules/services/networking/yggdrasil.nix | 8 | ||||
-rw-r--r-- | nixos/tests/yggdrasil.nix | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 0da50ccc344..5d65f8e3413 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -128,12 +128,6 @@ in { } ]; - environment.etc."yggdrasil.conf" = { - enable = true; - mode = "symlink"; - source = "/run/yggdrasil/yggdrasil.conf"; - }; - systemd.services.yggdrasil = { description = "Yggdrasil Network Service"; path = [ cfg.package ] ++ optional (configProvided && configFileProvided) pkgs.jq; @@ -146,7 +140,7 @@ in { ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/yggdrasil -useconffile /etc/yggdrasil.conf"; + ExecStart = "${cfg.package}/bin/yggdrasil -useconffile /run/yggdrasil/yggdrasil.conf"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index ddff35cce3a..0ef42a0180c 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -81,7 +81,7 @@ in import ./make-test.nix ({ pkgs, ...} : { denyDhcpcdInterfaces = [ "ygg0" ]; config = { IfTAPMode = true; - IFName = "ygg0"; + IfName = "ygg0"; MulticastInterfaces = [ "eth1" ]; LinkLocalTCPPort = 43210; }; |