From patchwork Sun Oct 11 09:43:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 24556 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3505227BBEB; Sun, 11 Oct 2020 10:45:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D783027BBEA for ; Sun, 11 Oct 2020 10:45:36 +0100 (BST) Received: from localhost ([::1]:58062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRXv6-00011Q-3G for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 05:45:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRXuY-0000eT-93 for guix-patches@gnu.org; Sun, 11 Oct 2020 05:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRXuX-0007Mf-Rv for guix-patches@gnu.org; Sun, 11 Oct 2020 05:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRXuX-0006g7-Nl for guix-patches@gnu.org; Sun, 11 Oct 2020 05:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43921] [Shepherd PATCH 1/2] Use XDG_CACHE_HOME/shepherd for unprivileged users' log directory. References: <874kn1rtgn.fsf@gnu.org> In-Reply-To: <874kn1rtgn.fsf@gnu.org> Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Oct 2020 09:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43921 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43921@debbugs.gnu.org Received: via spool by 43921-submit@debbugs.gnu.org id=B43921.160240945325597 (code B ref 43921); Sun, 11 Oct 2020 09:45:01 +0000 Received: (at 43921) by debbugs.gnu.org; 11 Oct 2020 09:44:13 +0000 Received: from localhost ([127.0.0.1]:39142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRXtf-0006eh-JX for submit@debbugs.gnu.org; Sun, 11 Oct 2020 05:44:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRXtd-0006dz-Lp for 43921@debbugs.gnu.org; Sun, 11 Oct 2020 05:44:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50040) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRXtX-0007HN-Li; Sun, 11 Oct 2020 05:43:59 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=48246 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1kRXtX-0008H9-4x; Sun, 11 Oct 2020 05:43:59 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 11 Oct 2020 11:43:57 +0200 Message-Id: <20201011094358.14013-1-janneke@gnu.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * modules/shepherd/support.scm (%user-cache-dir): New variable. (user-default-log-file): Use it. * doc/shepherd.texi (Invoking shepherd): Document it. --- doc/shepherd.texi | 4 +++- modules/shepherd/support.scm | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/shepherd.texi b/doc/shepherd.texi index 696477e..7c9a739 100644 --- a/doc/shepherd.texi +++ b/doc/shepherd.texi @@ -417,7 +417,9 @@ permissions are not as expected. Log output into @var{file}. For unprivileged users, the default log file is -@file{$XDG_CONFIG_HOME/shepherd/shepherd.log}. +@file{$XDG_CACHE_HOME/shepherd/shepherd.log}. If the +@code{XDG_CACHE_HOME} environment variable is not defined, +@code{$HOME/.cache/shepherd/shepherd.log} is used instead. @cindex syslog When running as root, the default behavior is to connect to diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm index cdb7b35..fe64a05 100644 --- a/modules/shepherd/support.scm +++ b/modules/shepherd/support.scm @@ -4,6 +4,7 @@ ;; Copyright (C) 2002, 2003 Wolfgang Jährling ;; Copyright (C) 2016 Mathieu Lirzin ;; Copyright (C) 2018 Danny Milosavljevic +;; Copyright (C) 2020 Jan (janneke) Nieuwenhuizen ;; ;; This file is part of the GNU Shepherd. ;; @@ -265,6 +266,12 @@ There is NO WARRANTY, to the extent permitted by law."))) (false-if-exception (passwd:dir (getpwuid (getuid)))) "/")) +(define %user-cache-dir + ;; Default cache directory if shepherd is run as a normal user. + (string-append (or (getenv "XDG_CACHE_HOME") + (string-append user-homedir "/.cache")) + "/shepherd")) + (define %user-config-dir ;; Default config directory if shepherd is run as a normal user. (string-append (or (getenv "XDG_CONFIG_HOME") @@ -302,8 +309,8 @@ TARGET should be a string representing a filepath + name." ;; Logging. (define (user-default-log-file) "Return the file name of the user's default log file." - (mkdir-p %user-config-dir #o700) - (string-append %user-config-dir "/shepherd.log")) + (mkdir-p %user-cache-dir #o700) + (string-append %user-cache-dir "/shepherd.log")) (define default-logfile-date-format ;; 'strftime' format string to prefix each entry in the log.