summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/wry.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-10-31 00:14:35 +0100
committerlassulus <lass@aidsballs.de>2015-10-31 00:14:35 +0100
commit10779f3cb9b7e00aac50faa98adbd2ebd9a675a0 (patch)
tree7aef8997e959c346cb9ae61f7bc1626a8c5bb473 /makefu/1systems/wry.nix
parent5b4a34062462311973bb1798fe3e4538e6eb5706 (diff)
parent546469e18d24252360279ea276eb9a502670c712 (diff)
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/1systems/wry.nix')
-rw-r--r--makefu/1systems/wry.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 3baf31dc5..c90b84451 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -11,6 +11,7 @@ in {
../../tv/2configs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/unstable-sources.nix
+ ../2configs/headless.nix
../2configs/tinc-basic-retiolum.nix
../2configs/bepasty-dual.nix
@@ -19,6 +20,11 @@ in {
# Reaktor
../2configs/Reaktor/simpleExtend.nix
+
+ # other nginx
+ ../2configs/nginx/euer.wiki.nix
+ # collectd
+ ../2configs/collectd/collectd-base.nix
];
krebs.build = {
@@ -27,8 +33,6 @@ in {
host = config.krebs.hosts.wry;
};
-
-
krebs.Reaktor.enable = true;
# bepasty to listen only on the correct interfaces
@@ -58,6 +62,7 @@ in {
networking = {
firewall.allowPing = true;
firewall.allowedTCPPorts = [ 53 80 443 ];
+ firewall.allowedUDPPorts = [ 655 ];
interfaces.enp2s1.ip4 = [{
address = external-ip;
prefixLength = 24;
@@ -67,6 +72,4 @@ in {
};
- # based on ../../tv/2configs/CAC-Developer-2.nix
- sound.enable = false;
}