From 2d7616fb3070fc5aeb2b3f5cc7082dcf21714a6f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 22:39:19 +0100
Subject: Fix setuid-wrappers path

---
 custom/tinc/def.nix | 2 +-
 custom/uucp.nix     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'custom')

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 58c5237c..a3bb00a0 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -18,7 +18,7 @@ in
 
       networks = mkOption {
         default = { };
-        type = types.loaOf types.optionSet;
+        type = types.loaOf types.submodule;
         description = ''
           Defines the tinc networks which will be started.
           Each network invokes a different daemon.
diff --git a/custom/uucp.nix b/custom/uucp.nix
index c69d15c5..0b4b1306 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -237,7 +237,7 @@ in {
                 choices as appropriate.  */
              #if 1
             -#define MAIL_PROGRAM "/usr/lib/sendmail -t"
-            +#define MAIL_PROGRAM "/var/setuid-wrappers/sendmail -t"
+            +#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t"
              /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
              #define MAIL_PROGRAM_TO_BODY 1
              #define MAIL_PROGRAM_SUBJECT_BODY 1
@@ -256,7 +256,7 @@ in {
             *) from="$from@$relay";;
           esac
 
-          exec /var/setuid-wrappers/sendmail -G -i -f "$from" -- "$@"
+          exec ${config.security.wrapperDir}/sendmail -G -i -f "$from" -- "$@"
         '';
     };
 
@@ -264,6 +264,6 @@ in {
       uucp
     ];
 
-    services.cron.systemCronJobs = (map (name: "${config.services.uucp.interval} /var/setuid-wrappers/uucico -D -S ${name}") (if (config.services.uucp.interval != null) then config.services.uucp.remoteNodes else []));
+    services.cron.systemCronJobs = (map (name: "${config.services.uucp.interval} ${config.security.wrapperDir}/uucico -D -S ${name}") (if (config.services.uucp.interval != null) then config.services.uucp.remoteNodes else []));
   };
 }
-- 
cgit v1.2.3