Merge remote-tracking branch 'prism/master'

8 files changed, 118 insertions, 18 deletions

diff --git a/krebs/5pkgs/games-user-env/default.nix b/krebs/5pkgs/games-user-env/default.nix
new file mode 100644
index 000000000..abe770ed1
--- /dev/null
+++ b/krebs/5pkgs/games-user-env/default.nix
@@ -0,0 +1,34 @@
+{ lib, pkgs, ... }: let
+
+#TODO: make sure env exists prior to running
+env_nix = pkgs.writeText "env.nix" ''
+  { pkgs ? import <nixpkgs> {} }:
+
+  (pkgs.buildFHSUserEnv {
+    name = "simple-x11-env";
+    targetPkgs = pkgs: with pkgs; [
+      coreutils
+    ];
+    multiPkgs = pkgs: with pkgs; [
+      alsaLib
+      zlib
+      xorg.libXxf86vm
+      curl
+      openal
+      openssl_1_0_2
+      xorg.libXext
+      xorg.libX11
+      xorg.libXrandr
+      xorg.libXcursor
+      xorg.libXinerama
+      xorg.libXi
+      mesa_glu
+    ];
+    runScript = "bash";
+  }).env
+'';
+
+
+in pkgs.writeDashBin "games-user-env" ''
+  nix-shell ${env_nix}
+''
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 84191da0b..92a1b51e9 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -17,7 +17,6 @@
     ../2configs/wine.nix
     ../2configs/chromium-patched.nix
     ../2configs/git.nix
-    ../2configs/bitlbee.nix
     ../2configs/skype.nix
     ../2configs/teamviewer.nix
     ../2configs/libvirt.nix
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 1bc8d5744..9da261ed4 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -188,9 +188,16 @@ in {
             "fullchain.pem"
             "full.pem"
           ];
-          user = "ejabberd";
+          allowKeysForGroup = true;
+          group = "lasscert";
         };
       };
+      users.groups.lasscert.members = [
+        "dovecot2"
+        "ejabberd"
+        "exim"
+        "nginx"
+      ];
       krebs.nginx.servers."lassul.us" = {
         server-names = [ "lassul.us" ];
         locations = [
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 90a990339..12a5a7365 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -44,8 +44,8 @@ in {
         sched.append(schedulers.SingleBranchScheduler(
                                     change_filter=util.ChangeFilter(branch_re=".*"),
                                     treeStableTimer=10,
-                                    name="prism-all-branches",
-                                    builderNames=["build-all"]))
+                                    name="build-all-branches",
+                                    builderNames=["build-all", "build-pkgs"]))
       '';
     };
     builder_pre = ''
@@ -111,7 +111,7 @@ in {
               slavenames=slavenames,
               factory=f))
 
-            '';
+      '';
 
       fast-tests = ''
         f = util.BuildFactory()
@@ -149,7 +149,64 @@ in {
         bu.append(util.BuilderConfig(name="fast-tests",
               slavenames=slavenames,
               factory=f))
+      '';
+      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.megaparsec",
+          "haskellPackages.scanner",
+          "haskellPackages.xmonad-stockholm",
+          "krebspaste",
+          "krebszones",
+          "logf",
+          "much",
+          "newsbot-js",
+          "noVNC",
+          "passwdqc-utils",
+          "populate",
+          "posix-array",
+          "pssh",
+          "push",
+          "Reaktor",
+          "realwallpaper",
+          "repo-sync",
+          "retiolum-bootstrap",
+          "tarantool",
+          "test",
+          "tinc_graphs",
+          "translate-shell",
+          "urlwatch",
+          "vncdotool",
+          "with-tmpdir",
+          "youtube-tools",
+        ]:
+          addShell(f,name="build-{}".format(i),env=env_lass,
+                  command=nixshell + \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make system=prism pkgs.{}".format(i)])
 
+        bu.append(util.BuilderConfig(name="build-pkgs",
+              slavenames=slavenames,
+              factory=f))
             '';
     };
     enable = true;
diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix
index 597d20721..a6de7c581 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -15,10 +15,11 @@ in {
       extraGroups = [
         "download"
       ];
-      openssh.authorizedKeys.keys = [
-        config.krebs.users.lass.pubkey
-        config.krebs.users.lass-uriel.pubkey
-        config.krebs.users.lass-shodan.pubkey
+      openssh.authorizedKeys.keys = with config.krebs.users; [
+        lass.pubkey
+        lass-uriel.pubkey
+        lass-shodan.pubkey
+        makefu.pubkey
       ];
     };
 
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index ff5698e4e..9988e788f 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -28,6 +28,9 @@ let
   good = moveToDir "G" "./.good";
   delete = moveToDir "D" "./.graveyard";
 
+  up = moveToDir "U" "./up";
+  down = moveToDir "Y" "./down";
+
   deleteCurrentTrack = pkgs.writeText "delete.lua" ''
     deleted_tmp = "./.graveyard"
 
diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix
index f2b70d831..46ff3fbf9 100644
--- a/lass/2configs/newsbot-js.nix
+++ b/lass/2configs/newsbot-js.nix
@@ -159,7 +159,6 @@ let
     torrentfreak|http://feeds.feedburner.com/Torrentfreak|#news
     torr_news|http://feed.torrentfreak.com/Torrentfreak/|#news
     travel_warnings|http://feeds.travel.state.gov/ca/travelwarnings-alerts|#news
-    #truther|http://truthernews.wordpress.com/feed/|#news
     un_afr|http://www.un.org/apps/news/rss/rss_africa.asp|#news
     un_am|http://www.un.org/apps/news/rss/rss_americas.asp|#news
     un_eu|http://www.un.org/apps/news/rss/rss_europe.asp|#news
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 58db4c94c..22144e9ec 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -119,15 +119,15 @@
   f = util.BuildFactory()
   f.addStep(grab_repo)
 
-  addShell(f,name="build-test-all-modules",env=env,
+  for i in [ "test-all-krebs-modules", "wolf" ]:
+    addShell(f,name="build-{}".format(i),env=env,
             command=nixshell + \
-                      ["touch retiolum.rsa_key.priv; \
-                        nix-build \
-                            --show-trace --no-out-link \
-                            -I nixos-config=./shared/1systems/test-all-krebs-modules.nix  \
-                            -I secrets=. \
-                            -A config.system.build.toplevel"]
-          )
+                ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                  make \
+                      test \
+                      target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                      method=build \
+                      system={}".format(i)])
 
   bu.append(util.BuilderConfig(name="build-local",
         slavenames=slavenames,