summary refs log tree commit diff
path: root/nixos/modules/services/networking/yggdrasil.nix
diff options
context:
space:
mode:
authorEmery Hemingway <ehmry@posteo.net>2019-11-16 12:57:56 +0100
committerEmery Hemingway <ehmry@posteo.net>2019-11-16 16:36:17 +0100
commit7a1b4d19648a2975244244a6983d7c60e245dc46 (patch)
tree5546bb1c82d7fa820d0eb11c67d51235e5c2955d /nixos/modules/services/networking/yggdrasil.nix
parent5af5b19bc7c7e59d30a61840c0c8a576e524466c (diff)
downloadnixpkgs-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.
Diffstat (limited to 'nixos/modules/services/networking/yggdrasil.nix')
-rw-r--r--nixos/modules/services/networking/yggdrasil.nix8
1 files changed, 1 insertions, 7 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";