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

nixos/yggdrasil: remove /etc effects

Browse Source 
Use of the /etc directory should be avoided for software without
hardcoded configuration paths.
This commit is contained in:
Emery Hemingway 2019-11-16 12:57:56 +01:00
parent 5af5b19bc7
commit 7a1b4d1964
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/networking/yggdrasil.nix
View File

@ -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";

2
nixos/tests/yggdrasil.nix
View File

@ -81,7 +81,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
denyDhcpcdInterfaces = [ "ygg0" ];
config = {
IfTAPMode = true;
IFName = "ygg0";
IfName = "ygg0";
MulticastInterfaces = [ "eth1" ];
LinkLocalTCPPort = 43210;
};