Merge remote-tracking branch 'prism/master'

9 files changed, 59 insertions, 103 deletions

diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 5edd1075d..e765ddbb4 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -32,7 +32,7 @@ in {
               stockholm_repo,
               workdir='stockholm-poller', branches=True,
               project='stockholm',
-              pollinterval=120
+              pollinterval=10
           )
       )
     '';
@@ -44,7 +44,7 @@ in {
                   change_filter=util.ChangeFilter(branch_re=".*"),
                   treeStableTimer=10,
                   name="build-all-branches",
-                  builderNames=["build-hosts", "build-pkgs"]
+                  builderNames=["build-hosts"]
               )
         )
       '';
@@ -77,6 +77,11 @@ in {
         "NIX_REMOTE": "daemon",
         "dummy_secrets": "true",
       }
+      env_tv = {
+        "LOGNAME": "tv",
+        "NIX_REMOTE": "daemon",
+        "dummy_secrets": "true",
+      }
 
       # prepare nix-shell
       # the dependencies which are used by the test script
@@ -91,6 +96,7 @@ in {
       #                   SSL_CERT_FILE,LOGNAME,NIX_REMOTE
       nixshell = [
         "nix-shell",
+        "-I", "/var/src",
         "-I", "stockholm=.",
         "-p"
       ] + deps + [ "--run" ]
@@ -103,45 +109,31 @@ in {
       build-hosts = ''
         f = util.BuildFactory()
         f.addStep(grab_repo)
-        for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]:
-            addShell(f,name="build-{}".format(i),env=env_shared,
-                command=nixshell + \
-                    ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
-                        make NIX_PATH=$HOME/$LOGNAME test method=build \
-                            target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
-                            system={}".format(i)
-                    ]
+
+        def build_host(env, host):
+            addShell(f,name="build-{}".format(i),env=env,
+                command=nixshell + ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
+                      echo $HOME; echo $LOGNAME; \
+                      test -e $HOME/$LOGNAME/nixpkgs || cp -r /var/src/nixpkgs $HOME/$LOGNAME/; \
+                      make NIX_PATH=$HOME/$LOGNAME:secrets=/var/src/stockholm/null test method=build \
+                          target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
+                          system={}".format(host)]
             )
 
+        for i in [ "alnus", "mu", "nomic", "wu", "xu", "zu" ]:
+            build_host(env_tv, i)
+
         for i in [ "mors", "uriel", "shodan", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]:
-            addShell(f,name="build-{}".format(i),env=env_lass,
-                command=nixshell + \
-                    ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
-                        make NIX_PATH=$HOME/$LOGNAME test method=build \
-                            target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
-                            system={}".format(i)
-                    ]
-            )
+            build_host(env_lass, i)
 
         for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
-            addShell(f,name="build-{}".format(i),env=env_makefu,
-                command=nixshell + \
-                    ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
-                        make NIX_PATH=$HOME/$LOGNAME test method=build \
-                            target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
-                            system={}".format(i)
-                    ]
-            )
+            build_host(env_makefu, i)
 
         for i in [ "hiawatha", "onondaga" ]:
-            addShell(f,name="build-{}".format(i),env=env_nin,
-                command=nixshell + \
-                    ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
-                        make NIX_PATH=$HOME/$LOGNAME test method=build \
-                            target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
-                            system={}".format(i)
-                    ]
-            )
+            build_host(env_nin, i)
+
+        for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]:
+            build_host(env_shared, i)
 
         bu.append(
             util.BuilderConfig(
@@ -152,63 +144,6 @@ in {
         )
 
       '';
-
-      build-pkgs = ''
-        f = util.BuildFactory()
-        f.addStep(grab_repo)
-        for i in [
-          "apt-cacher-ng",
-          "bepasty-client-cli",
-          "cac-api",
-          "cac-cert",
-          "cac-panel",
-          "charybdis",
-          "collectd-connect-time",
-          "dic",
-          "drivedroid-gen-repo",
-          "exim",
-          "fortclientsslvpn",
-          "get",
-          "git-hooks",
-          "github-hosts-sync",
-          "go",
-          "hashPassword",
-          "haskellPackages.blessings",
-          "haskellPackages.email-header",
-          "haskellPackages.scanner",
-          "haskellPackages.xmonad-stockholm",
-          "krebspaste",
-          "logf",
-          "much",
-          "newsbot-js",
-          "noVNC",
-          "ovh-zone",
-          "passwdqc-utils",
-          "populate",
-          "posix-array",
-          "pssh",
-          "push",
-          "Reaktor",
-          "realwallpaper",
-          "repo-sync",
-          "retiolum-bootstrap",
-          "tarantool",
-          "test",
-          "tinc_graphs",
-          "translate-shell",
-          "urlwatch",
-          "with-tmpdir",
-          "youtube-tools",
-        ]:
-          addShell(f,name="build-{}".format(i),env=env_lass,
-                  command=nixshell + \
-                      ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
-                        make system=prism pkgs.{}".format(i)])
-
-        bu.append(util.BuilderConfig(name="build-pkgs",
-              workernames=workernames,
-              factory=f))
-            '';
     };
     enable = true;
     web.enable = true;
@@ -230,9 +165,6 @@ in {
     username = "testworker";
     password = "lasspass";
     packages = with pkgs; [ gnumake jq nix populate ];
-    extraEnviron = {
-      NIX_PATH="/var/src";
-    };
   };
   config.krebs.iptables = {
     tables = {
diff --git a/lass/2configs/ciko.nix b/lass/2configs/ciko.nix
new file mode 100644
index 000000000..56c9a286c
--- /dev/null
+++ b/lass/2configs/ciko.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+{
+  users.users.ciko = {
+    uid = genid_signed "ciko";
+    description = "acc for ciko";
+    home = "/home/ciko";
+    useDefaultShell = true;
+    createHome = true;
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTUWm/fISw/gbuHvf3kwxGEuk1aY5HrNNvr8QXCQv0khDdaYmZSELbtFQtE04WGTWmackNcLpld5mETVyCM0BjOgqMJYQNhtywxfYcodEY5xxHCuGgA3S1t94MZub+DRodXCfB0yUV85Wbb0sltkMTJufMwYmLEGxSLRukxAOcNsXdjlyro96csmYrIiV6R7+REnz8OcR7sKlI4tvKA1mbvWmjbDBd1MZ8Jc0Lwf+b0H/rH69wEQIcB5HRHHJIChoAk0t2azSjXagk1+4AebONZTCKvTHxs/D2wUBIzoxyjmh5S0aso/cKw8qpKcl/A2mZiIvW3KMlJAM5U+RQKMrr"
+    ];
+  };
+  krebs.exim-smarthost = {
+    internet-aliases = [
+      { from = "*@slash16.net"; to = "ciko"; }
+    ];
+    sender_domains = [
+      "slash16.net"
+    ];
+  };
+}
+
diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix
index ec86d4120..d9307347e 100644
--- a/lass/2configs/htop.nix
+++ b/lass/2configs/htop.nix
@@ -8,7 +8,6 @@ with import <stockholm/lib>;
     htop = pkgs.symlinkJoin {
       name = "htop";
       paths = [
-        super.htop
         (pkgs.writeDashBin "htop" ''
           export HTOPRC=${pkgs.writeText "htoprc" ''
             fields=0 48 17 18 38 39 40 2 46 47 49 1
@@ -38,6 +37,7 @@ with import <stockholm/lib>;
           ''}
           exec ${super.htop}/bin/htop "$@"
         '')
+        super.htop
       ];
     };
   };
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 5748b6eaf..feb532709 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -116,10 +116,10 @@ let
   mutt = pkgs.symlinkJoin {
     name = "mutt";
     paths = [
-      pkgs.neomutt
       (pkgs.writeDashBin "mutt" ''
         exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@
       '')
+      pkgs.neomutt
     ];
   };
 
diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix
index 62fd52f3f..3bd1852a8 100644
--- a/lass/2configs/mc.nix
+++ b/lass/2configs/mc.nix
@@ -325,7 +325,6 @@ in {
     (pkgs.symlinkJoin {
       name = "mc";
       paths = [
-        pkgs.mc
         (pkgs.writeDashBin "mc" ''
           export MC_DATADIR=${pkgs.writeOut "mc-ext" {
               "/mc.ext".link = mcExt;
@@ -334,6 +333,7 @@ in {
           export TERM=xterm-256color
           exec ${pkgs.mc}/bin/mc -S xoria256 "$@"
         '')
+        pkgs.mc
       ];
     })
   ];
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index c8b590857..04fd9213e 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -10,10 +10,10 @@ let
   mpv = pkgs.symlinkJoin {
     name = "mpv";
     paths = [
-      pkgs.mpv
       (pkgs.writeDashBin "mpv" ''
         exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@"
       '')
+      pkgs.mpv
     ];
   };
 
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 1c68d58d5..2adba34bb 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "0a4db15";
+    ref = "4847963";
   };
 }
diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 1e14e31bb..7f531bf3a 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -132,7 +132,10 @@ in {
 
   krebs.Reaktor.playlist = {
     nickname = "the_playlist|r";
-    channels = [ "#the_playlist" ];
+    channels = [
+      "#the_playlist"
+      "#krebs"
+    ];
     extraEnviron = {
       REAKTOR_HOST = "irc.freenode.org";
     };
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index b0d28d4da..aaf311576 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -35,17 +35,16 @@ in {
       "apanowicz.de"
       "nirwanabluete.de"
       "aldonasiech.com"
-      "360gradvideo.tv"
       "ubikmedia.eu"
       "facts.cloud"
       "youthtube.xyz"
       "illucloud.eu"
       "illucloud.de"
       "illucloud.com"
+      "joemisch.com"
       "www.apanowicz.de"
       "www.nirwanabluete.de"
       "www.aldonasiech.com"
-      "www.360gradvideo.tv"
       "www.ubikmedia.eu"
       "www.facts.cloud"
       "www.youthtube.xyz"
@@ -62,7 +61,6 @@ in {
       "karlaskop.ubikmedia.de"
       "nb.ubikmedia.de"
       "youthtube.ubikmedia.de"
-      "joemisch.com"
     ])
   ];