From e7e58b90a986d9167cfe5a6821a52568e9aeaf89 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 17 Apr 2018 19:25:13 +0200 Subject: =?UTF-8?q?borealis=20=E2=86=92=20heimdallr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/tinc/yggdrasil.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix index b9004f67..73c8276e 100644 --- a/custom/tinc/yggdrasil.nix +++ b/custom/tinc/yggdrasil.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.yggdrasilTinc; - borealis-up = pkgs.writeScript "borealis-up.sh" '' + heimdallr-up = pkgs.writeScript "heimdallr-up.sh" '' #!${pkgs.stdenv.shell} ${pkgs.nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999 ${optionalString cfg.useDNS '' @@ -16,7 +16,7 @@ let ''} ''; - borealis-down = pkgs.writeScript "borealis-down.sh" '' + heimdallr-down = pkgs.writeScript "heimdallr-down.sh" '' #!${pkgs.stdenv.shell} ${pkgs.nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE ${optionalString cfg.useDNS '' @@ -40,7 +40,7 @@ in { default = true; type = types.bool; description = '' - Use borealis as primary dns server + Use heimdallr as primary dns server ''; }; @@ -65,7 +65,7 @@ in { security.sudo = { enable = true; extraConfig = '' - tinc.yggdrasil ${config.networking.hostName} = (root) NOPASSWD: SETENV: ${borealis-up}, ${borealis-down} + tinc.yggdrasil ${config.networking.hostName} = (root) NOPASSWD: SETENV: ${heimdallr-up}, ${heimdallr-down} ''; }; @@ -79,15 +79,15 @@ in { ${optionalString cfg.connect "ConnectTo = ymir"} ''; scripts = { - "hosts/borealis-up" = '' + "hosts/heimdallr-up" = '' #!${pkgs.stdenv.shell} - exec ${config.security.wrapperDir}/sudo -En ${borealis-up} + exec ${config.security.wrapperDir}/sudo -En ${heimdallr-up} ''; - "hosts/borealis-down" = '' + "hosts/heimdallr-down" = '' #!${pkgs.stdenv.shell} - exec ${config.security.wrapperDir}/sudo -En ${borealis-down} + exec ${config.security.wrapperDir}/sudo -En ${heimdallr-down} ''; }; }; -- cgit v1.2.3