summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/shoney.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-14 09:54:02 +0200
committerlassulus <lass@aidsballs.de>2016-06-14 09:54:02 +0200
commitd5cfc4bf1992f566044861b220243be20d31491c (patch)
treee056a8c441904db72618a09bf7fb5d5c8beec3af /makefu/1systems/shoney.nix
parent371750b8d8a031694e2ffa368f787bfcdb2a9d46 (diff)
parenteb710a17e28bbec2a4f7877533f101fa78ece209 (diff)
Merge remote-tracking branch 'wolf/master'
Diffstat (limited to 'makefu/1systems/shoney.nix')
-rw-r--r--makefu/1systems/shoney.nix24
1 files changed, 16 insertions, 8 deletions
diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix
index ebe5222c3..48679fe58 100644
--- a/makefu/1systems/shoney.nix
+++ b/makefu/1systems/shoney.nix
@@ -1,15 +1,20 @@
{ config, pkgs, ... }:
let
- ip = "64.137.235.70";
- gw = "64.137.235.1";
+ ip = "64.137.234.215";
+ alt-ip = "64.137.234.210";
+ extra-ip = "64.137.234.114"; #currently unused
+ gw = "64.137.234.1";
in {
imports = [
../.
- ../../tv/2configs/hw/CAC.nix
- ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
+ ../2configs/hw/CAC.nix
+ ../2configs/fs/CAC-CentOS-7-64bit.nix
];
+
+ services.tinc.networks.siem.name = "sjump";
+
# minimal resources
services.nixosManual.enable = false;
programs.man.enable = false;
@@ -21,10 +26,13 @@ in {
retiolum.enable = true;
build.host = config.krebs.hosts.shoney;
};
- networking.interfaces.enp2s1.ip4 = [ {
- address = ip;
- prefixLength = 24;
- } ];
+ networking.interfaces.enp2s1.ip4 = [
+ { address = ip; prefixLength = 24; }
+ { address = alt-ip; prefixLength = 24; }
+ ];
+
networking.defaultGateway = gw;
networking.nameservers = [ "8.8.8.8" ];
+ networking.firewall.allowedUDPPorts = [ 655 1655 ];
+ networking.firewall.allowedTCPPorts = [ 655 1655 ];
}