Merge remote-tracking branch 'lass/master'

3 files changed, 7 insertions, 107 deletions

diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 30fc674bc..eaeb1991f 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
       # /dev/pts is empty except for 1 file
       # my life sucks
       nixpkgs.config.packageOverrides = super: {
-        irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
+        irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
           pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
             pkgs.coreutils
             (pkgs.writeDashBin "tee" ''
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c8d9465d5..dd3777c64 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -32,14 +32,11 @@ with import <stockholm/lib>;
         { predicate = "-p tcp --dport 11100"; target = "ACCEPT"; }
       ];
     }
-    #{
-    #  services.elasticsearch = {
-    #    enable = true;
-    #    plugins = [
-    #    #  pkgs.elasticsearchPlugins.elasticsearch_kopf
-    #    ];
-    #  };
-    #}
+    {
+      services.elasticsearch = {
+        enable = true;
+      };
+    }
     {
       #zalando project
       services.postgresql = {
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 01cfe5414..02054a8e5 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -1,5 +1,4 @@
 { config, lib, pkgs, ... }:
-
 with import <stockholm/lib>;
 
 let
@@ -46,6 +45,7 @@ in {
     ../2configs/monitoring/monit-alarms.nix
     ../2configs/paste.nix
     ../2configs/syncthing.nix
+    ../2configs/coders-irc.nix
     {
       imports = [
         ../2configs/bepasty.nix
@@ -254,103 +254,6 @@ in {
       ];
     }
     {
-      krebs.Reaktor.coders = {
-        nickname = "Reaktor|lass";
-        channels = [ "#coders" "#germany" ];
-        extraEnviron = {
-          REAKTOR_HOST = "irc.hackint.org";
-        };
-        plugins = with pkgs.ReaktorPlugins; let
-
-          lambdabot = (import (pkgs.fetchFromGitHub {
-            owner = "NixOS"; repo = "nixpkgs";
-            rev = "a4ec1841da14fc98c5c35cc72242c23bb698d4ac";
-            sha256 = "148fpw31s922hxrf28yhrci296f7c7zd81hf0k6zs05rq0i3szgy";
-          }) {}).lambdabot;
-
-          lambdabotflags = ''
-            -XStandaloneDeriving -XGADTs -XFlexibleContexts \
-            -XFlexibleInstances -XMultiParamTypeClasses \
-            -XOverloadedStrings -XFunctionalDependencies \'';
-        in [
-          url-title
-          (buildSimpleReaktorPlugin "lambdabot-pl" {
-            pattern = "^@pl (?P<args>.*)$$";
-            script = pkgs.writeDash "lambda-pl" ''
-              exec ${lambdabot}/bin/lambdabot \
-                ${indent lambdabotflags}
-                -e "@pl $1"
-            '';
-          })
-          (buildSimpleReaktorPlugin "lambdabot-type" {
-            pattern = "^@type (?P<args>.*)$$";
-            script = pkgs.writeDash "lambda-type" ''
-              exec ${lambdabot}/bin/lambdabot \
-                ${indent lambdabotflags}
-                -e "@type $1"
-            '';
-          })
-          (buildSimpleReaktorPlugin "lambdabot-let" {
-            pattern = "^@let (?P<args>.*)$$";
-            script = pkgs.writeDash "lambda-let" ''
-              exec ${lambdabot}/bin/lambdabot \
-                ${indent lambdabotflags}
-                -e "@let $1"
-            '';
-          })
-          (buildSimpleReaktorPlugin "lambdabot-run" {
-            pattern = "^@run (?P<args>.*)$$";
-            script = pkgs.writeDash "lambda-run" ''
-              exec ${lambdabot}/bin/lambdabot \
-                ${indent lambdabotflags}
-                -e "@run $1"
-            '';
-          })
-          (buildSimpleReaktorPlugin "lambdabot-kind" {
-            pattern = "^@kind (?P<args>.*)$$";
-            script = pkgs.writeDash "lambda-kind" ''
-              exec ${lambdabot}/bin/lambdabot \
-                ${indent lambdabotflags}
-                -e "@kind $1"
-            '';
-          })
-          (buildSimpleReaktorPlugin "lambdabot-kind" {
-            pattern = "^@kind (?P<args>.*)$$";
-            script = pkgs.writeDash "lambda-kind" ''
-              exec ${lambdabot}/bin/lambdabot \
-                ${indent lambdabotflags}
-                -e "@kind $1"
-            '';
-          })
-          (buildSimpleReaktorPlugin "random-unicorn-porn" {
-            pattern = "^!rup$$";
-            script = pkgs.writePython2 "rup" ''
-              #!${pkgs.python2}/bin/python
-              t1 = """
-                                  _.
-                               ;=',_ ()
-                     8===D~~  S" .--`||
-                             sS  \__ ||
-                          __.' ( \-->||
-                       _=/    _./-\/ ||
-              8===D~~ ((\( /-'   -'l ||
-                       ) |/ \\      (_))
-                          \\  \\
-                           '~ '~
-              """
-              print(t1)
-            '';
-          })
-          (buildSimpleReaktorPlugin "ping" {
-            pattern = "^!ping (?P<args>.*)$$";
-            script = pkgs.writeDash "ping" ''
-              exec /var/setuid-wrappers/ping -q -c1 "$1" 2>&1 | tail -1
-            '';
-          })
-        ];
-      };
-    }
-    {
       krebs.Reaktor.prism = {
         nickname = "Reaktor|lass";
         channels = [ "#retiolum" ];