Merge remote-tracking branch 'ni/master' into staging/test

This commit is contained in:
lassulus 2017-12-25 23:01:27 +01:00
commit 3a41a73f1f
4 changed files with 37 additions and 0 deletions

View File

@ -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)"
'
''

View File

@ -29,6 +29,7 @@ with import <stockholm/lib>;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
chromium
firefoxWrapper firefoxWrapper
gimp gimp
kate kate
@ -65,6 +66,8 @@ with import <stockholm/lib>;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
nixpkgs.config.chromium.enablePepperFlash = true;
programs.ssh.startAgent = false; programs.ssh.startAgent = false;
services.printing = { services.printing = {

View File

@ -3,6 +3,9 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
environment.systemPackages = [
pkgs.eximlog
];
krebs.exim-retiolum.enable = true; krebs.exim-retiolum.enable = true;
tv.iptables.input-retiolum-accept-tcp = singleton "smtp"; tv.iptables.input-retiolum-accept-tcp = singleton "smtp";
} }

View File

@ -3,6 +3,9 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
environment.systemPackages = [
pkgs.eximlog
];
krebs.exim-smarthost = { krebs.exim-smarthost = {
enable = true; enable = true;
dkim = [ dkim = [