From 014b33637c41c38c49454f9c4ca91a02eda3562a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 7 Aug 2008 10:09:17 +0000 Subject: [PATCH] Added an option to easily allow everyone to use "at". svn path=/nixos/trunk/; revision=12531 --- system/options.nix | 8 ++++++++ upstart-jobs/atd.nix | 3 ++- upstart-jobs/default.nix | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/system/options.nix b/system/options.nix index ac1262d7f9b3..af8217ff9af0 100644 --- a/system/options.nix +++ b/system/options.nix @@ -650,6 +650,14 @@ Whether to enable the `at' daemon, a command scheduler. ''; }; + + allowEveryone = mkOption { + default = false; + description = '' + Whether to make /var/spool/at{jobs,spool} writeable + by everyone (and sticky). + ''; + }; }; locate = { diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix index 260c3001c35d..8a775d0c5d76 100644 --- a/upstart-jobs/atd.nix +++ b/upstart-jobs/atd.nix @@ -1,4 +1,4 @@ -{ at }: +{ at, config }: let uid = (import ../system/ids.nix).uids.atd; gid = (import ../system/ids.nix).gids.atd; @@ -44,6 +44,7 @@ start script fi done chmod 1770 "$spooldir" "$jobdir" + ${if config.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""} if [ ! -f "$etcdir"/at.deny ] then touch "$etcdir"/at.deny && \ diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix index 9882c5909305..fb2e6f5ed600 100644 --- a/upstart-jobs/default.nix +++ b/upstart-jobs/default.nix @@ -173,6 +173,7 @@ let ++ optional config.services.atd.enable (import ../upstart-jobs/atd.nix { at = pkgs.at; + config = config.services.atd; }) # DHCP client.