summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-17 19:25:13 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-17 19:25:13 +0200
commite7e58b90a986d9167cfe5a6821a52568e9aeaf89 (patch)
treed3fe4ffba0649d4849201c2854c82a87f768c841
parent3485711b407264c8f94aa506098eddfe698401e7 (diff)
downloadnixos-e7e58b90a986d9167cfe5a6821a52568e9aeaf89.tar
nixos-e7e58b90a986d9167cfe5a6821a52568e9aeaf89.tar.gz
nixos-e7e58b90a986d9167cfe5a6821a52568e9aeaf89.tar.bz2
nixos-e7e58b90a986d9167cfe5a6821a52568e9aeaf89.tar.xz
nixos-e7e58b90a986d9167cfe5a6821a52568e9aeaf89.zip
borealis → heimdallr
-rw-r--r--custom/tinc/yggdrasil.nix16
1 files 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;
5let 5let
6 cfg = config.services.yggdrasilTinc; 6 cfg = config.services.yggdrasilTinc;
7 7
8 borealis-up = pkgs.writeScript "borealis-up.sh" '' 8 heimdallr-up = pkgs.writeScript "heimdallr-up.sh" ''
9 #!${pkgs.stdenv.shell} 9 #!${pkgs.stdenv.shell}
10 ${pkgs.nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999 10 ${pkgs.nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999
11 ${optionalString cfg.useDNS '' 11 ${optionalString cfg.useDNS ''
@@ -16,7 +16,7 @@ let
16 ''} 16 ''}
17 ''; 17 '';
18 18
19 borealis-down = pkgs.writeScript "borealis-down.sh" '' 19 heimdallr-down = pkgs.writeScript "heimdallr-down.sh" ''
20 #!${pkgs.stdenv.shell} 20 #!${pkgs.stdenv.shell}
21 ${pkgs.nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE 21 ${pkgs.nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE
22 ${optionalString cfg.useDNS '' 22 ${optionalString cfg.useDNS ''
@@ -40,7 +40,7 @@ in {
40 default = true; 40 default = true;
41 type = types.bool; 41 type = types.bool;
42 description = '' 42 description = ''
43 Use borealis as primary dns server 43 Use heimdallr as primary dns server
44 ''; 44 '';
45 }; 45 };
46 46
@@ -65,7 +65,7 @@ in {
65 security.sudo = { 65 security.sudo = {
66 enable = true; 66 enable = true;
67 extraConfig = '' 67 extraConfig = ''
68 tinc.yggdrasil ${config.networking.hostName} = (root) NOPASSWD: SETENV: ${borealis-up}, ${borealis-down} 68 tinc.yggdrasil ${config.networking.hostName} = (root) NOPASSWD: SETENV: ${heimdallr-up}, ${heimdallr-down}
69 ''; 69 '';
70 }; 70 };
71 71
@@ -79,15 +79,15 @@ in {
79 ${optionalString cfg.connect "ConnectTo = ymir"} 79 ${optionalString cfg.connect "ConnectTo = ymir"}
80 ''; 80 '';
81 scripts = { 81 scripts = {
82 "hosts/borealis-up" = '' 82 "hosts/heimdallr-up" = ''
83 #!${pkgs.stdenv.shell} 83 #!${pkgs.stdenv.shell}
84 84
85 exec ${config.security.wrapperDir}/sudo -En ${borealis-up} 85 exec ${config.security.wrapperDir}/sudo -En ${heimdallr-up}
86 ''; 86 '';
87 "hosts/borealis-down" = '' 87 "hosts/heimdallr-down" = ''
88 #!${pkgs.stdenv.shell} 88 #!${pkgs.stdenv.shell}
89 89
90 exec ${config.security.wrapperDir}/sudo -En ${borealis-down} 90 exec ${config.security.wrapperDir}/sudo -En ${heimdallr-down}
91 ''; 91 '';
92 }; 92 };
93 }; 93 };