nixos/yggdrasil: remove /etc effects
Use of the /etc directory should be avoided for software without hardcoded configuration paths.
This commit is contained in:
parent
5af5b19bc7
commit
7a1b4d1964
|
@ -128,12 +128,6 @@ in {
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.etc."yggdrasil.conf" = {
|
|
||||||
enable = true;
|
|
||||||
mode = "symlink";
|
|
||||||
source = "/run/yggdrasil/yggdrasil.conf";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.yggdrasil = {
|
systemd.services.yggdrasil = {
|
||||||
description = "Yggdrasil Network Service";
|
description = "Yggdrasil Network Service";
|
||||||
path = [ cfg.package ] ++ optional (configProvided && configFileProvided) pkgs.jq;
|
path = [ cfg.package ] ++ optional (configProvided && configFileProvided) pkgs.jq;
|
||||||
|
@ -146,7 +140,7 @@ in {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
serviceConfig = {
|
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";
|
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
|
||||||
denyDhcpcdInterfaces = [ "ygg0" ];
|
denyDhcpcdInterfaces = [ "ygg0" ];
|
||||||
config = {
|
config = {
|
||||||
IfTAPMode = true;
|
IfTAPMode = true;
|
||||||
IFName = "ygg0";
|
IfName = "ygg0";
|
||||||
MulticastInterfaces = [ "eth1" ];
|
MulticastInterfaces = [ "eth1" ];
|
||||||
LinkLocalTCPPort = 43210;
|
LinkLocalTCPPort = 43210;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue