From c65614cdef66c38ff2939928e9072873e19e1c37 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 27 Sep 2015 19:34:13 +0200
Subject: add tor,virtualbox

---
 makefu/2configs/virtualization-virtualbox.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 makefu/2configs/virtualization-virtualbox.nix

(limited to 'makefu/2configs/virtualization-virtualbox.nix')

diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix
new file mode 100644
index 000000000..164401f77
--- /dev/null
+++ b/makefu/2configs/virtualization-virtualbox.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  mainUser = config.krebs.build.user;
+  version = "5.0.4";
+  rev = "102546";
+  vboxguestpkg = pkgs.fetchurl {
+        url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
+        sha256 = "1ykwpjvfgj11iwhx70bh2hbxhyy3hg6rnqzl4qac7xzg8xw8wqg4";
+      };
+in {
+  inherit vboxguestpkg;
+  virtualisation.virtualbox.host.enable = true;
+  nixpkgs.config.virtualbox.enableExtensionPack = true;
+
+  users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
+  environment.systemPackages = [ vboxguestpkg ];
+}
-- 
cgit v1.3.1


From d9f4d621bcde5ddc983a922e378657dba1f6e141 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 27 Sep 2015 21:50:40 +0200
Subject: Reaktor: add extraEnviron for setting Channel

---
 krebs/3modules/Reaktor.nix                    | 25 +++++++++++++++----------
 makefu/1systems/pnp.nix                       |  4 ++++
 makefu/2configs/virtualization-virtualbox.nix |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'makefu/2configs/virtualization-virtualbox.nix')

diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix
index fce24fa63..82089a660 100644
--- a/krebs/3modules/Reaktor.nix
+++ b/krebs/3modules/Reaktor.nix
@@ -2,7 +2,6 @@
 
 
 let
-  kpkgs = import ../5pkgs { inherit pkgs; inherit lib; };
 
   inherit (lib)
     mkIf
@@ -63,13 +62,20 @@ let
         configuration appended to the default or overridden configuration
       '';
     };
-
-    ReaktorPkg = mkOption {
-      default = kpkgs.Reaktor;
+    extraEnviron = mkOption {
+      default = {};
+      type = types.attrsOf types.str;
       description = ''
-        the Reaktor pkg to use.
+        Environment to be provided to the service, can be:
+          REAKTOR_HOST
+          REAKTOR_PORT
+          REAKTOR_STATEDIR
+          REAKTOR_CHANNELS
+
+          debug and nickname can be set separately via the Reaktor api
       '';
     };
+
     debug = mkOption {
       default = false;
       description = ''
@@ -80,7 +86,6 @@ let
 
   imp = {
     # for reaktor get-config
-    environment.systemPackages = [ cfg.ReaktorPkg ];
     users.extraUsers = singleton {
       name = "Reaktor";
       # uid = config.ids.uids.Reaktor;
@@ -98,7 +103,7 @@ let
     systemd.services.Reaktor = {
       path = with pkgs; [
         utillinux #flock for tell_on-join
-        # git # for nag
+        git # for nag
         python # for caps
         ];
       description = "Reaktor IRC Bot";
@@ -108,17 +113,17 @@ let
         GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
         REAKTOR_NICKNAME = cfg.nickname;
         REAKTOR_DEBUG = (if cfg.debug  then "True" else "False");
-        };
+        } // cfg.extraEnviron;
       serviceConfig= {
         ExecStartPre = pkgs.writeScript "Reaktor-init" ''
           #! /bin/sh
           ${if (isString cfg.overrideConfig) then
             ''cp ${ReaktorConfig} /tmp/config.py''
           else
-            ''(${cfg.ReaktorPkg}/bin/reaktor get-config;cat "${ReaktorConfig}" ) > /tmp/config.py''
+            ''(${pkgs.Reaktor}/bin/reaktor get-config;cat "${ReaktorConfig}" ) > /tmp/config.py''
           }
         '';
-        ExecStart = "${cfg.ReaktorPkg}/bin/reaktor run /tmp/config.py";
+        ExecStart = "${pkgs.Reaktor}/bin/reaktor run /tmp/config.py";
         PrivateTmp = "true";
         User = "Reaktor";
         Restart = "on-abort";
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 497c03e11..7698ea14d 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -32,6 +32,10 @@
     ];
   krebs.Reaktor.enable = true;
   krebs.Reaktor.debug = true;
+  krebs.Reaktor.nickname = "Reaktor|bot";
+  krebs.Reaktor.extraEnviron = {
+    REAKTOR_CHANNELS = "#krebs,#binaergewitter";
+  };
 
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix
index 164401f77..610b63732 100644
--- a/makefu/2configs/virtualization-virtualbox.nix
+++ b/makefu/2configs/virtualization-virtualbox.nix
@@ -9,7 +9,7 @@ let
         sha256 = "1ykwpjvfgj11iwhx70bh2hbxhyy3hg6rnqzl4qac7xzg8xw8wqg4";
       };
 in {
-  inherit vboxguestpkg;
+  #inherit vboxguestpkg;
   virtualisation.virtualbox.host.enable = true;
   nixpkgs.config.virtualbox.enableExtensionPack = true;
 
-- 
cgit v1.3.1