diff options
| author | makefu <github@syntax-fehler.de> | 2016-07-11 20:46:09 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-07-11 20:46:32 +0200 |
| commit | 50229a32997d1685b8f3359a675c43828b024362 (patch) | |
| tree | 1755f1ebccd19605975ca91273ade0e388da2bbd /makefu | |
| parent | 45b79ac86b1ff2a48de33aa3a10057dba2d6e8f3 (diff) | |
m 1 shoney: configure forward-journal
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/shoney.nix | 14 | ||||
| -rw-r--r-- | makefu/3modules/default.nix | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix index 1fe8871d2..3a3ac9c7c 100644 --- a/makefu/1systems/shoney.nix +++ b/makefu/1systems/shoney.nix @@ -3,8 +3,9 @@ let tinc-siem-ip = "10.8.10.1"; ip = "64.137.234.215"; - alt-ip = "64.137.234.210"; - extra-ip = "64.137.234.114"; #currently unused + alt-ip = "64.137.234.210"; # honeydrive honeyd + extra-ip1 = "64.137.234.114"; # floating tinc.siem + extra-ip2 = "64.137.234.232"; # honeydrive gw = "64.137.234.1"; in { imports = [ @@ -15,7 +16,7 @@ in { ]; - + environment.systemPackages = [ pkgs.honeyd ]; services.tinc.networks.siem.name = "sjump"; krebs = { @@ -37,10 +38,15 @@ in { }; }; }; + makefu.forward-journal = { + enable = true; + src = "10.8.10.1"; + dst = "10.8.10.6"; + }; networking = { interfaces.enp2s1.ip4 = [ { address = ip; prefixLength = 24; } - { address = alt-ip; prefixLength = 24; } + # { address = alt-ip; prefixLength = 24; } ]; defaultGateway = gw; diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix index 853bdca04..febebaa18 100644 --- a/makefu/3modules/default.nix +++ b/makefu/3modules/default.nix @@ -6,6 +6,7 @@ _: ./umts.nix ./taskserver.nix ./awesome-extra.nix + ./forward-journal.nix ]; } |