From b1569158057042aa50e6816e38f0305bab8e5f9c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 28 Jul 2016 12:58:54 +0200
Subject: makefu: pornocauster -> x

---
 makefu/1systems/pornocauster.nix | 81 ----------------------------------------
 makefu/1systems/wbob.nix         |  2 +-
 makefu/1systems/x.nix            | 73 ++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 82 deletions(-)
 delete mode 100644 makefu/1systems/pornocauster.nix
 create mode 100644 makefu/1systems/x.nix

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
deleted file mode 100644
index b683e5630..000000000
--- a/makefu/1systems/pornocauster.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-#
-#
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ../.
-      ../2configs/main-laptop.nix #< base-gui + zsh
-      ../2configs/laptop-utils.nix
-
-      # Krebs
-      #../2configs/disable_v6.nix
-
-
-      # applications
-
-      ../2configs/exim-retiolum.nix
-      ../2configs/mail-client.nix
-      ../2configs/printer.nix
-      ../2configs/virtualization.nix
-      ../2configs/virtualization-virtualbox.nix
-      ../2configs/wwan.nix
-
-      # services
-      ../2configs/git/brain-retiolum.nix
-      ../2configs/tor.nix
-      ../2configs/steam.nix
-      # ../2configs/buildbot-standalone.nix
-
-      # hardware specifics are in here
-      ../2configs/hw/tp-x220.nix
-      ../2configs/hw/rtl8812au.nix
-      # mount points
-      ../2configs/fs/sda-crypto-root-home.nix
-      # ../2configs/mediawiki.nix
-      #../2configs/wordpress.nix
-      ../2configs/nginx/public_html.nix
-
-      ../2configs/tinc/retiolum.nix
-      # temporary modules
-      ../2configs/temp/share-samba.nix
-      # ../2configs/temp/elkstack.nix
-      # ../2configs/temp/sabnzbd.nix
-    ];
-
-  services.tinc.networks.siem = {
-    name = "makefu";
-    extraConfig = ''
-      ConnectTo = sdarth
-      ConnectTo = sjump
-    '';
-  };
-
-  krebs.nginx = {
-    default404 = false;
-    servers.default.listen = [ "80 default_server" ];
-    servers.default.server-names = [ "_" ];
-  };
-
-  environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
-
-  virtualisation.docker.enable = true;
-
-  # configure pulseAudio to provide a HDMI sink as well
-  networking.firewall.enable = true;
-  networking.firewall.allowedTCPPorts = [ 80 24800 ];
-  networking.firewall.allowedUDPPorts = [ 665 ];
-
-  krebs.build.host = config.krebs.hosts.pornocauster;
-  krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11";
-
-  krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
-
-  networking.extraHosts = ''
-    192.168.1.11 omo.local
-  '';
-  # hard dependency because otherwise the device will not be unlocked
-  boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
-}
diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix
index e8e0b091f..ff593ab35 100644
--- a/makefu/1systems/wbob.nix
+++ b/makefu/1systems/wbob.nix
@@ -66,7 +66,7 @@ in {
     client = {
       enable = true;
       screenName = "wbob";
-      serverAddress = "pornocauster.r";
+      serverAddress = "x.r";
     };
   };
 }
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
new file mode 100644
index 000000000..d41edfa46
--- /dev/null
+++ b/makefu/1systems/x.nix
@@ -0,0 +1,73 @@
+#
+#
+#
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ../.
+      ../2configs/main-laptop.nix #< base-gui + zsh
+      ../2configs/laptop-utils.nix
+
+      # Krebs
+      #../2configs/disable_v6.nix
+
+
+      # applications
+
+      ../2configs/exim-retiolum.nix
+      ../2configs/mail-client.nix
+      ../2configs/printer.nix
+      ../2configs/virtualization.nix
+      ../2configs/virtualization-virtualbox.nix
+      ../2configs/wwan.nix
+
+      # services
+      ../2configs/git/brain-retiolum.nix
+      ../2configs/tor.nix
+      ../2configs/steam.nix
+      # ../2configs/buildbot-standalone.nix
+
+      # hardware specifics are in here
+      ../2configs/hw/tp-x220.nix
+      ../2configs/hw/rtl8812au.nix
+      # mount points
+      ../2configs/fs/sda-crypto-root-home.nix
+      # ../2configs/mediawiki.nix
+      #../2configs/wordpress.nix
+      ../2configs/nginx/public_html.nix
+
+      ../2configs/tinc/retiolum.nix
+      # temporary modules
+      ../2configs/temp/share-samba.nix
+      # ../2configs/temp/elkstack.nix
+      # ../2configs/temp/sabnzbd.nix
+      ../2configs/tinc/siem.nix
+    ];
+  krebs.nginx = {
+    default404 = false;
+    servers.default.listen = [ "80 default_server" ];
+    servers.default.server-names = [ "_" ];
+  };
+
+  environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
+
+  virtualisation.docker.enable = true;
+
+  # configure pulseAudio to provide a HDMI sink as well
+  networking.firewall.enable = true;
+  networking.firewall.allowedTCPPorts = [ 80 24800 26061 ];
+  networking.firewall.allowedUDPPorts = [ 665 26061 ];
+
+  krebs.build.host = config.krebs.hosts.x;
+  krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11";
+
+  krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
+
+  networking.extraHosts = ''
+    192.168.1.11 omo.local
+  '';
+  # hard dependency because otherwise the device will not be unlocked
+  boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
+}
-- 
cgit v1.2.3