From dca3279a80a25f2c7669045ca813961e31644145 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 27 Jul 2018 18:05:17 +0200 Subject: [PATCH] Fix vpn routing and git access --- common/secret/default.nix | Bin 4375 -> 4478 bytes hosts/hera/borg.nix | 2 +- hosts/hera/git.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/secret/default.nix b/common/secret/default.nix index 7eb3bbdd42f9bcd4c22f5c45a5d231b173505662..06f5011ee9f5d42ca8d10e3629a16d6c44e451ec 100644 GIT binary patch literal 4478 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 QH^mbE?P(A(F}uFp;jIzX3IG5A literal 4375 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 RX^%D=obNtvubG1B9`r$nYQg{j diff --git a/hosts/hera/borg.nix b/hosts/hera/borg.nix index 46162157..884209dc 100644 --- a/hosts/hera/borg.nix +++ b/hosts/hera/borg.nix @@ -11,7 +11,7 @@ in { networking = { interfaces.eth0 = { - ipv6.addresses = [{ address = config.m-0.hosts.borg; prefixLength = 64; }]; + ipv6.addresses = [{ address = config.m-0.hosts.borg; prefixLength = 112; }]; }; inherit (config.networking) nameservers; defaultGateway6 = { address = config.m-0.hosts.hera-intern; interface = "eth0"; }; diff --git a/hosts/hera/git.nix b/hosts/hera/git.nix index 2abac84c..8a3f9a34 100644 --- a/hosts/hera/git.nix +++ b/hosts/hera/git.nix @@ -19,7 +19,7 @@ in { }; networking = { interfaces.eth0 = { - ipv6.addresses = [{ address = config.m-0.hosts.git; prefixLength = 64; }]; + ipv6.addresses = [{ address = config.m-0.hosts.git; prefixLength = 112; }]; }; inherit (config.networking) nameservers; defaultGateway6 = { address = config.m-0.hosts.hera-intern; interface = "eth0"; };