From 13be61e360e769ad28fc48df20524e483cf00efc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 21 Dec 2017 01:24:11 +0100
Subject: eximlog: init

---
 krebs/5pkgs/simple/eximlog.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 krebs/5pkgs/simple/eximlog.nix

diff --git a/krebs/5pkgs/simple/eximlog.nix b/krebs/5pkgs/simple/eximlog.nix
new file mode 100644
index 000000000..2d64e13e9
--- /dev/null
+++ b/krebs/5pkgs/simple/eximlog.nix
@@ -0,0 +1,28 @@
+{ jq, systemd, writeDashBin }:
+
+let
+  lib = import <stockholm/lib>;
+  user = "exim"; # TODO make this configurable
+in
+
+# TODO execute eximlog only if journalctl doesn't fail
+# bash's set -o pipefail isn't enough
+
+writeDashBin "eximlog" ''
+  ${systemd}/bin/journalctl \
+      -u ${lib.shell.escape user} \
+      -o short-unix \
+      "$@" \
+    |
+  ${jq}/bin/jq -Rr '
+    # Only select lines that start with a timestamp
+    select(test("^[0-9]")) |
+
+    split(" ") |
+    (.[0] | tonumber) as $time |
+    (.[3:] | join(" ")) as $message |
+
+    "\($time | strftime("%Y-%m-%d %H:%M:%S %z")) \($message)"
+
+  '
+''
-- 
cgit v1.2.3


From 9f37a4c4f7fff0246577d233a1497fc5a7ceb8d2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 21 Dec 2017 01:27:07 +0100
Subject: tv exim-*: add eximlog

---
 tv/2configs/exim-retiolum.nix  | 3 +++
 tv/2configs/exim-smarthost.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix
index bf13a388a..8b34b16cf 100644
--- a/tv/2configs/exim-retiolum.nix
+++ b/tv/2configs/exim-retiolum.nix
@@ -3,6 +3,9 @@
 with import <stockholm/lib>;
 
 {
+  environment.systemPackages = [
+    pkgs.eximlog
+  ];
   krebs.exim-retiolum.enable = true;
   tv.iptables.input-retiolum-accept-tcp = singleton "smtp";
 }
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 079013c79..68fbcd151 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -3,6 +3,9 @@
 with import <stockholm/lib>;
 
 {
+  environment.systemPackages = [
+    pkgs.eximlog
+  ];
   krebs.exim-smarthost = {
     enable = true;
     dkim = [
-- 
cgit v1.2.3


From 28085c8e6d37a0dd31d7627fa01d072723c4f46c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 22 Dec 2017 21:31:39 +0100
Subject: tv querel: add chromium with flash

---
 tv/1systems/querel/config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 05b4d9133..07ec8e403 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -29,6 +29,7 @@ with import <stockholm/lib>;
   };
 
   environment.systemPackages = with pkgs; [
+    chromium
     firefoxWrapper
     gimp
     kate
@@ -65,6 +66,8 @@ with import <stockholm/lib>;
 
   networking.networkmanager.enable = true;
 
+  nixpkgs.config.chromium.enablePepperFlash = true;
+
   programs.ssh.startAgent = false;
 
   services.printing = {
-- 
cgit v1.2.3