From adace5302f92fa8e41d7c3d1fde62623328a4633 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 31 Jul 2017 14:23:25 +0200
Subject: ma virtualisation: move to subdir

---
 makefu/1systems/darth/config.nix              |  2 +-
 makefu/1systems/wbob/config.nix               | 11 ++++++-----
 makefu/1systems/x/config.nix                  |  8 +++++---
 makefu/2configs/docker.nix                    |  4 ----
 makefu/2configs/virtualisation/docker.nix     |  4 ++++
 makefu/2configs/virtualisation/libvirt.nix    |  9 +++++++++
 makefu/2configs/virtualisation/virtualbox.nix | 26 ++++++++++++++++++++++++++
 makefu/2configs/virtualization-virtualbox.nix | 26 --------------------------
 makefu/2configs/virtualization.nix            |  9 ---------
 9 files changed, 51 insertions(+), 48 deletions(-)
 delete mode 100644 makefu/2configs/docker.nix
 create mode 100644 makefu/2configs/virtualisation/docker.nix
 create mode 100644 makefu/2configs/virtualisation/libvirt.nix
 create mode 100644 makefu/2configs/virtualisation/virtualbox.nix
 delete mode 100644 makefu/2configs/virtualization-virtualbox.nix
 delete mode 100644 makefu/2configs/virtualization.nix

diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix
index e0f90b8dd..9dbe67429 100644
--- a/makefu/1systems/darth/config.nix
+++ b/makefu/1systems/darth/config.nix
@@ -15,7 +15,7 @@ in {
       <stockholm/makefu/2configs/zsh-user.nix>
       <stockholm/makefu/2configs/smart-monitor.nix>
       <stockholm/makefu/2configs/exim-retiolum.nix>
-      <stockholm/makefu/2configs/virtualization.nix>
+      <stockholm/makefu/2configs/virtualisation/libvirt.nix>
 
       <stockholm/makefu/2configs/tinc/retiolum.nix>
       <stockholm/makefu/2configs/share/temp-share-samba.nix>
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index d7f642360..b776b49d6 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -13,17 +13,18 @@ in {
       <stockholm/makefu/2configs/tools/core-gui.nix>
       <stockholm/makefu/2configs/tools/extra-gui.nix>
       <stockholm/makefu/2configs/tools/media.nix>
-      <stockholm/makefu/2configs/virtualization.nix>
+      <stockholm/makefu/2configs/virtualisation/libvirt.nix>
       <stockholm/makefu/2configs/tinc/retiolum.nix>
       <stockholm/makefu/2configs/mqtt.nix>
       <stockholm/makefu/2configs/deployment/led-fader.nix>
       # <stockholm/makefu/2configs/gui/wbob-kiosk.nix>
       <stockholm/makefu/2configs/stats/client.nix>
 
-      <stockholm/makefu/2configs/gui/studio-virtual.nix>
-      <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
-      <stockholm/makefu/2configs/audio/realtime-audio.nix>
-      <stockholm/makefu/2configs/vncserver.nix>
+      # <stockholm/makefu/2configs/gui/studio-virtual.nix>
+      # <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
+      # <stockholm/makefu/2configs/audio/realtime-audio.nix>
+      # <stockholm/makefu/2configs/vncserver.nix>
+      <stockholm/makefu/2configs/temp/rst-issue.nix>
     ];
 
   krebs = {
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 80c09df1c..969e78bee 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -19,6 +19,8 @@ with import <stockholm/lib>;
       # <stockholm/makefu/2configs/disable_v6.nix>
 
       # Testing
+      # <stockholm/makefu/2configs/deployment/gitlab.nix>
+
       # <stockholm/makefu/2configs/torrent.nix>
       # <stockholm/makefu/2configs/lanparty/lancache.nix>
       # <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
@@ -37,9 +39,9 @@ with import <stockholm/lib>;
       <stockholm/makefu/2configs/task-client.nix>
 
       # Virtualization
-      <stockholm/makefu/2configs/virtualization.nix>
-      <stockholm/makefu/2configs/docker.nix>
-      <stockholm/makefu/2configs/virtualization-virtualbox.nix>
+      <stockholm/makefu/2configs/virtualisation/libvirt.nix>
+      <stockholm/makefu/2configs/virtualisation/docker.nix>
+      <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
 
       # Services
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
diff --git a/makefu/2configs/docker.nix b/makefu/2configs/docker.nix
deleted file mode 100644
index 98fd980cc..000000000
--- a/makefu/2configs/docker.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}:
-{
-  virtualisation.docker.enable = true;
-}
diff --git a/makefu/2configs/virtualisation/docker.nix b/makefu/2configs/virtualisation/docker.nix
new file mode 100644
index 000000000..98fd980cc
--- /dev/null
+++ b/makefu/2configs/virtualisation/docker.nix
@@ -0,0 +1,4 @@
+{...}:
+{
+  virtualisation.docker.enable = true;
+}
diff --git a/makefu/2configs/virtualisation/libvirt.nix b/makefu/2configs/virtualisation/libvirt.nix
new file mode 100644
index 000000000..b90467ab8
--- /dev/null
+++ b/makefu/2configs/virtualisation/libvirt.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+let
+  mainUser = config.krebs.build.user;
+in {
+  virtualisation.libvirtd.enable = true;
+  users.extraUsers.${mainUser.name}.extraGroups = [ "libvirtd" ];
+  networking.firewall.checkReversePath = false; # TODO: unsolved issue in nixpkgs:#9067 [bug]
+}
diff --git a/makefu/2configs/virtualisation/virtualbox.nix b/makefu/2configs/virtualisation/virtualbox.nix
new file mode 100644
index 000000000..30de6e44a
--- /dev/null
+++ b/makefu/2configs/virtualisation/virtualbox.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+let
+  mainUser = config.krebs.build.user;
+  vboxguestpkg =  lib.stdenv.mkDerivation rec {
+    name = "Virtualbox-Extensions-${version}-${rev}";
+    version = "5.0.20";
+    rev = "106931";
+    src = pkgs.fetchurl {
+        url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
+        sha256 = "1dc70x2m7x266zzw5vw36mxqj7xykkbk357fc77f9zrv4lylzvaf";
+      };
+  };
+in {
+  virtualisation.virtualbox.host.enable = true;
+  nixpkgs.config.virtualbox.enableExtensionPack = true;
+  virtualisation.virtualbox.host.enableHardening = false;
+
+  users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
+  nixpkgs.config.packageOverrides = super: {
+    boot.kernelPackages.virtualbox = super.boot.kernelPackages.virtualbox.override {
+      buildInputs = super.boot.kernelPackages.virtualBox.buildInputs
+        ++ [ vboxguestpkg ];
+    };
+  };
+}
diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix
deleted file mode 100644
index cde176bf3..000000000
--- a/makefu/2configs/virtualization-virtualbox.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  mainUser = config.krebs.build.user;
-  vboxguestpkg =  lib.stdenv.mkDerivation rec {
-    name = "Virtualbox-Extensions-${version}-${rev}";
-    version = "5.0.20";
-    rev = "106931";
-    src = pkgs.fetchurl {
-        url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
-        sha256 = "1dc70x2m7x266zzw5vw36mxqj7xykkbk357fc77f9zrv4lylzvaf";
-      };
-  };
-in {
-  virtualisation.virtualbox.host.enable = true;
-  nixpkgs.config.virtualbox.enableExtensionPack = true;
-  virtualization.virtualbox.host.enableHardening = false;
-
-  users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
-  nixpkgs.config.packageOverrides = super: {
-    boot.kernelPackages.virtualbox = super.boot.kernelPackages.virtualbox.override {
-      buildInputs = super.boot.kernelPackages.virtualBox.buildInputs
-        ++ [ vboxguestpkg ];
-    };
-  };
-}
diff --git a/makefu/2configs/virtualization.nix b/makefu/2configs/virtualization.nix
deleted file mode 100644
index b90467ab8..000000000
--- a/makefu/2configs/virtualization.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  mainUser = config.krebs.build.user;
-in {
-  virtualisation.libvirtd.enable = true;
-  users.extraUsers.${mainUser.name}.extraGroups = [ "libvirtd" ];
-  networking.firewall.checkReversePath = false; # TODO: unsolved issue in nixpkgs:#9067 [bug]
-}
-- 
cgit v1.2.3