From 4ba18c6d2a442834e79b5526eff0aa2c5f8398e8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 21 May 2020 11:03:32 +0200
Subject: ma omo,x.r: disable ipv6 until studio-link issue is resolved

---
 makefu/1systems/omo/config.nix  | 24 ++++++++++++++----------
 makefu/1systems/x/config.nix    |  2 ++
 makefu/2configs/legacy_only.nix |  8 ++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 makefu/2configs/legacy_only.nix

(limited to 'makefu')

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 37fb9128d..cfe0d0a3f 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -26,6 +26,10 @@ in {
       # <stockholm/makefu/2configs/disable_v6.nix>
       #<stockholm/makefu/2configs/graphite-standalone.nix>
       #<stockholm/makefu/2configs/share-user-sftp.nix>
+
+      <stockholm/makefu/2configs/urlwatch>
+      <stockholm/makefu/2configs/legacy_only.nix>
+
       <stockholm/makefu/2configs/share/omo.nix>
       <stockholm/makefu/2configs/dcpp/airdcpp.nix>
       { krebs.airdcpp.dcpp.shares = let
@@ -125,16 +129,16 @@ in {
 
   zramSwap.enable = true;
 
-  krebs.Reaktor.reaktor-shack = {
-    nickname = "Reaktor|shack";
-    workdir = "/var/lib/Reaktor/shack";
-    channels = [ "#shackspace" ];
-    plugins = with pkgs.ReaktorPlugins;
-    [ shack-correct
-      # stockholm-issue
-      sed-plugin
-      random-emoji ];
-  };
+  #krebs.Reaktor.reaktor-shack = {
+  #  nickname = "Reaktor|shack";
+  #  workdir = "/var/lib/Reaktor/shack";
+  #  channels = [ "#shackspace" ];
+  #  plugins = with pkgs.ReaktorPlugins;
+  #  [ shack-correct
+  #    # stockholm-issue
+  #    sed-plugin
+  #    random-emoji ];
+  #};
   #krebs.Reaktor.reaktor-bgt = {
   #  nickname = "Reaktor|bgt";
   #  workdir = "/var/lib/Reaktor/bgt";
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index ea92e3485..4e6706b25 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -19,7 +19,9 @@
       <stockholm/makefu/2configs/tools/all.nix>
       { programs.adb.enable = true; }
 
+      { systemd.services.docker.wantedBy = lib.mkForce []; }
       <stockholm/makefu/2configs/dict.nix>
+      <stockholm/makefu/2configs/legacy_only.nix>
       #<stockholm/makefu/3modules/netboot_server.nix>
       #{
       #  netboot_server = {
diff --git a/makefu/2configs/legacy_only.nix b/makefu/2configs/legacy_only.nix
new file mode 100644
index 000000000..3d40471ba
--- /dev/null
+++ b/makefu/2configs/legacy_only.nix
@@ -0,0 +1,8 @@
+{ networking.enableIPv6 = false;
+  boot.kernel.sysctl = {
+    "net.ipv6.conf.all.disable_ipv6" = 1;
+    "net.ipv6.conf.default.disable_ipv6" = 1;
+    "net.ipv6.conf.lo.disable_ipv6" = 1;
+  };
+  boot.kernelParams = [ "ipv6.disable=1" ];
+}
-- 
cgit v1.2.3