summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-10 19:01:43 +0100
committermakefu <github@syntax-fehler.de>2015-11-10 19:01:43 +0100
commit5ac356be526cc43105421194f6939ed11b4beaa6 (patch)
treeb16f6430f62e1ced7e2c49133a8c43a8fd7a6f48 /makefu
parentc9032105eb4abe2eecbeeb31df7b62ed082bb6fc (diff)
parentb394c79051fbcf6cf072f2b9af75819d37cd2426 (diff)
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/gum.nix36
1 files changed, 26 insertions, 10 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 85cf4c533..3a010220e 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -9,24 +9,41 @@ in {
# TODO: copy this config or move to krebs
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
+ ../2configs/fs/single-partition-ext4.nix
# ../2configs/iodined.nix
- # Reaktor
- ../2configs/Reaktor/simpleExtend.nix
];
+ krebs.build.target = "root@gum.krebsco.de";
krebs.build.host = config.krebs.hosts.gum;
- krebs.Reaktor.enable = true;
+ # Hardware
+ boot.loader.grub.device = "/dev/sda";
+ boot.initrd.availableKernelModules = [ "pata_via" "uhci_hcd" ];
+ boot.kernelModules = [ "kvm-intel" ];
- # prepare graphs
- krebs.nginx.enable = true;
+ # Network
+ services.udev.extraRules = ''
+ SUBSYSTEM=="net", ATTR{address}=="c8:0a:a9:c8:ee:dd", NAME="et0"
+ '';
networking = {
- firewall.allowPing = true;
- firewall.allowedTCPPorts = [ 80 443 655 ];
- firewall.allowedUDPPorts = [ 655 ];
- interfaces.enp2s1.ip4 = [{
+ firewall = {
+ allowPing = true;
+ allowedTCPPorts = [
+ # smtp
+ 25
+ # http
+ 80 443
+ # tinc
+ 655
+ ];
+ allowedUDPPorts = [
+ # tinc
+ 655 53
+ ];
+ };
+ interfaces.et0.ip4 = [{
address = external-ip;
prefixLength = 24;
}];
@@ -34,5 +51,4 @@ in {
nameservers = [ "8.8.8.8" ];
};
- # based on ../../tv/2configs/CAC-Developer-2.nix
}