From 41d42abefe9a13ca9ae0f3d2d53825a73d0cf744 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:18:27 +0200
Subject: ma gum.r: enable feed.euer

---
 makefu/1systems/gum/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 8603d7696..7f7330ea6 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -137,6 +137,7 @@ in {
       <stockholm/makefu/2configs/deployment/owncloud.nix>
       <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix>
       <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix>
+      <stockholm/makefu/2configs/deployment/feed.euer.krebsco.de>
       <stockholm/makefu/2configs/deployment/boot-euer.nix>
       <stockholm/makefu/2configs/deployment/gecloudpad>
       <stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix>
-- 
cgit v1.2.3


From 4988384a3f4239e89a33fa434a622577fa2731a1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 21:29:56 +0200
Subject: ma x.r: giving up on virtualbox again

---
 makefu/1systems/x/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 4c479875e..169f32c16 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -71,7 +71,7 @@
       # Virtualization
       # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
-      <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
+      #<stockholm/makefu/2configs/virtualisation/virtualbox.nix>
       #{
       #  networking.firewall.allowedTCPPorts = [ 8080 ];
       #  networking.nat = {
-- 
cgit v1.2.3


From 3e6850f128edf0c75437c63ae654f1f524061720 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 23:40:07 +0200
Subject: ma x.r: re-enable virtualbox, fix warning

---
 makefu/1systems/x/config.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 169f32c16..ea92e3485 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -71,7 +71,7 @@
       # Virtualization
       # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
-      #<stockholm/makefu/2configs/virtualisation/virtualbox.nix>
+      <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
       #{
       #  networking.firewall.allowedTCPPorts = [ 8080 ];
       #  networking.nat = {
@@ -162,7 +162,11 @@
   krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ];
 
   # hard dependency because otherwise the device will not be unlocked
-  boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
+  boot.initrd.luks.devices.luksroot =
+  {
+      device = "/dev/sda2";
+      allowDiscards = true;
+  };
   # avoid full boot dir
   boot.loader.grub.configurationLimit = 3;
 
-- 
cgit v1.2.3


From d71182a1bb1894acab5b44ddce6df0c682dfe2f4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 10:23:25 +0200
Subject: ma gum.r: fix owncloud

---
 makefu/1systems/gum/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 7f7330ea6..5639691e2 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -108,7 +108,6 @@ in {
       ## network
       <stockholm/makefu/2configs/vpn/openvpn-server.nix>
       # <stockholm/makefu/2configs/vpn/vpnws/server.nix>
-      <stockholm/makefu/2configs/dnscrypt/server.nix>
       <stockholm/makefu/2configs/binary-cache/server.nix>
       <stockholm/makefu/2configs/backup/server.nix>
       <stockholm/makefu/2configs/iodined.nix>
-- 
cgit v1.2.3


From f0f0bc51bf02b94894a5e64e1ea6e0536bdece92 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 2 May 2020 22:57:45 +0200
Subject: ma gum.r: enable etherpad via docker-container

---
 makefu/1systems/gum/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 5639691e2..a38a671f4 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -140,6 +140,7 @@ in {
       <stockholm/makefu/2configs/deployment/boot-euer.nix>
       <stockholm/makefu/2configs/deployment/gecloudpad>
       <stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix>
+      <stockholm/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix>
       <stockholm/makefu/2configs/shiori.nix>
 
       <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
-- 
cgit v1.2.3


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 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'makefu/1systems')

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 = {
-- 
cgit v1.2.3