From 937905d28c904205b1647095fa50827db91c249d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 2 Jun 2018 20:32:09 +0200
Subject: disable debug & add media group

---
 custom/recv-media.sh        | 12 ++++++------
 custom/uucp-mediaclient.nix | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'custom')

diff --git a/custom/recv-media.sh b/custom/recv-media.sh
index f99aaaf0..d9ed888d 100644
--- a/custom/recv-media.sh
+++ b/custom/recv-media.sh
@@ -16,12 +16,12 @@ if [[ -n "${3}" ]]; then
   target="${dir}"/$(@coreutils@/bin/base64 -d <<<${3})
 fi
 
-@utillinux@/bin/logger --id=$pid -t recv-media -p user.debug <<EOF
-$(id)
-$(stat ${dir})
-$(stat ${1})
-$(echo ${2})
-EOF
+# @utillinux@/bin/logger --id=$pid -t recv-media -p user.debug <<EOF
+# $(id)
+# $(stat ${dir})
+# $(stat ${1})
+# $(echo ${2})
+# EOF
 
 if [[ $(id -Gn) != *"$group"* ]]; then
   printf "Groups are ‘%s’. Trying to switch primary group to ‘%s’..." $(id -Gn) $group
diff --git a/custom/uucp-mediaclient.nix b/custom/uucp-mediaclient.nix
index 42fa0246..1b79d4a5 100644
--- a/custom/uucp-mediaclient.nix
+++ b/custom/uucp-mediaclient.nix
@@ -76,6 +76,11 @@ in {
         default = "/var/media";
         description = "Media directory";
       };
+
+      mediaGroup = mkOption {
+        type = types.str;
+        default = "media";
+      };
     };
   };
 
@@ -86,6 +91,16 @@ in {
     services.uucp.remoteNodes = genAttrs cfg.remoteNodes (name: { commands = ["recv-media"]; } );
 
     assertions = map (user: { assertion = elem user config.services.notify-users; message = "Notification must be allowed for ${user}!"; }) (unique cfg.notify.users);
+
+    users.groups."${cfg.mediaGroup}" = {
+      members = [ "uucp" ];
+    };
+
+    system.activationScripts = ''
+      mkdir -m 0755 -pv ${cfg.mediaDir}
+      chown :${cfg.mediaGroup} ${cfg.mediaDir}
+      chmod -c "g+rwx" ${cfg.mediaDir}
+    '';
   };
 }
 
-- 
cgit v1.2.3