Merge remote-tracking branch 'prism/master'

3 files changed, 23 insertions, 12 deletions

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 8603d7696..a38a671f4 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>
@@ -137,9 +136,11 @@ 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>
+      <stockholm/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix>
       <stockholm/makefu/2configs/shiori.nix>
 
       <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
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 4c479875e..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 = {
@@ -162,7 +164,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;