diff options
| author | tv <tv@krebsco.de> | 2017-05-02 14:12:48 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-05-02 14:12:48 +0200 |
| commit | 308ececd19153f72ada4ad636bcdc64ff4dccf68 (patch) | |
| tree | d0f4931795a3e77356a40026270ee35e8bdfd787 /krebs | |
| parent | 1f14476a0ffa3dcf0576121edc914b15cfb971b9 (diff) | |
| parent | 22188f14d3e4eb309fba69a65049cb2c1ec05e2d (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 651b9a3c6..650344981 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -427,7 +427,7 @@ with import <stockholm/lib>; }; gum = rec { - cores = 1; + cores = 2; extraZones = { "krebsco.de" = '' @@ -448,7 +448,7 @@ with import <stockholm/lib>; }; nets = rec { internet = { - ip4.addr = "195.154.108.70"; + ip4.addr = "188.68.40.19"; aliases = [ "gum.i" ]; @@ -456,7 +456,7 @@ with import <stockholm/lib>; retiolum = { via = internet; ip4.addr = "10.243.0.211"; - # ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2"; + ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2"; aliases = [ "gum.r" "cgit.gum.r" |