diff options
| author | makefu <github@syntax-fehler.de> | 2016-06-14 01:36:15 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-06-14 01:36:15 +0200 |
| commit | eb710a17e28bbec2a4f7877533f101fa78ece209 (patch) | |
| tree | 591878b08c6d051418928e7dd94bd0d21853157f /krebs/3modules/retiolum.nix | |
| parent | 618684954207feed26b1b85f0721d41d5ca4c5c3 (diff) | |
| parent | 5bc3fa88543cdf3aa5b9103f7423a2af490b3d08 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/retiolum.nix')
| -rw-r--r-- | krebs/3modules/retiolum.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix index 5a035fa5..22991f09 100644 --- a/krebs/3modules/retiolum.nix +++ b/krebs/3modules/retiolum.nix @@ -159,13 +159,13 @@ let PrivateKeyFile = ${cfg.privkey.path} ${cfg.extraConfig} ''; - "tinc-up" = pkgs.writeScript "${cfg.netname}-tinc-up" '' + "tinc-up" = pkgs.writeDash "${cfg.netname}-tinc-up" '' ${iproute}/sbin/ip link set ${cfg.netname} up - ${optionalString (net.ip4 != null) '' + ${optionalString (net.ip4 != null) /* sh */ '' ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${cfg.netname} ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${cfg.netname} ''} - ${optionalString (net.ip6 != null) '' + ${optionalString (net.ip6 != null) /* sh */ '' ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${cfg.netname} ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${cfg.netname} ''} |