From d49dd672463aff72bd754d657abbd11cf8a0d8e0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 2 Jun 2018 17:58:57 +0200
Subject: revamp uucp-mediaclient

---
 hel.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'hel.nix')

diff --git a/hel.nix b/hel.nix
index 423f90bd..efc58b8f 100644
--- a/hel.nix
+++ b/hel.nix
@@ -15,6 +15,8 @@
       ./custom/tinc/yggdrasil.nix
       ./custom/uucp.nix
       ./custom/borgbackup.nix
+      ./custom/uucp-mediaclient.nix
+      ./custom/notify-users.nix
       ./utils/nix/module.nix
     ];
 
@@ -214,7 +216,7 @@
         "odin" = {
           publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcDj49TqmflGTmtGBqDawxmCBWW1txj61CZ7KT0hTHK uucp@odin"];
           hostnames = ["odin.asgard.yggdrasil"];
-          commands = lib.mkForce ["recv-media" "notify-gkleen"];
+          commands = ["notify-gkleen"];
         };
         "ymir" = {
           publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir"];
@@ -222,9 +224,16 @@
         };
       };
       
-      commandPath = [ "${pkgs.callPackage ./hel/recv-media.nix {}}/bin" config.security.wrapperDir ];
+      commandPath = [ "${config.security.wrapperDir}" ];
       defaultCommands = lib.mkForce [];
+
+      media-client = {
+        remoteNodes = [ "odin" ];
+        notify.users = [ "gkleen" ];
+      };
     };
+
+    notify-users = [ "gkleen" ];
     
     postfix = {
       enable = true;
@@ -357,15 +366,6 @@
                  "mount.cifs".source = "${pkgs.cifs-utils}/bin/mount.cifs";
                  "thinklight".source =
                    "${(pkgs.callPackage ./custom/thinklight.nix { thinklight = "kbd_backlight"; })}/bin/thinklight";
-                 "notify-gkleen" = {
-                   group = "users";
-                   owner = "gkleen";
-                   setgid = true;
-                   setuid = true;
-                   permissions = "u+rx,g+x,o+x";
-                   source = let notify-user = pkgs.callPackage ./custom/notify-user.nix { inherit (pkgs.haskellPackages) ghcWithPackages; };
-                             in "${notify-user}/bin/notify-gkleen";
-                 };
                };
 
     polkit = {
-- 
cgit v1.2.3