@@ -13,11 +13,10 @@ let
1313 # creates hylafax config file,
1414 # makes sure "Include" is listed *first*
1515 let
16− mkLines = conf:
17− (lib.concatLists
18− (lib.flip lib.mapAttrsToList conf
19− (k: map (v: "${k}: ${v}")
20− )));
16+ mkLines = lib.flip lib.pipe [
17+ (lib.mapAttrsToList (key: map (val: "${key}: ${val}")))
18+ lib.concatLists
19+ ];
2120 include = mkLines { Include = conf.Include or []; };
2221 other = mkLines ( conf // { Include = []; } );
2322 in
@@ -48,13 +47,12 @@ let
4847 name = "hylafax-setup-spool.sh";
4948 src = ./spool.sh;
5049 isExecutable = true;
51− inherit (pkgs.stdenv) shell;
52− hylafax = pkgs.hylafaxplus;
5350 faxuser = "uucp";
5451 faxgroup = "uucp";
5552 lockPath = "/var/lock";
5653 inherit globalConfigPath modemConfigPath;
5754 inherit (cfg) sendmailPath spoolAreaPath userAccessFile;
55+ inherit (pkgs) hylafaxplus runtimeShell;
5856 };
5957
6058 waitFaxqScript = pkgs.substituteAll {
@@ -64,8 +62,8 @@ let
6462 src = ./faxq-wait.sh;
6563 isExecutable = true;
6664 timeoutSec = toString 10;
67− inherit (pkgs.stdenv) shell;
6865 inherit (cfg) spoolAreaPath;
66+ inherit (pkgs) runtimeShell;
6967 };
7068
7169 sockets.hylafax-hfaxd = {
@@ -108,8 +106,10 @@ let
108106 PrivateDevices = true; # breaks /dev/tty...
109107 PrivateNetwork = true;
110108 PrivateTmp = true;
109+ #ProtectClock = true; # breaks /dev/tty... (why?)
111110 ProtectControlGroups = true;
112111 #ProtectHome = true; # breaks custom spool dirs
112+ ProtectKernelLogs = true;
113113 ProtectKernelModules = true;
114114 ProtectKernelTunables = true;
115115 #ProtectSystem = "strict"; # breaks custom spool dirs