Merge branch 'master' of pnp:stockholm

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
 }