03/09: services: Use 'file-append' for user account shells.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 56a93cb975ddc33d50183fb122e2aafda026f18e
Author: Ludovic Courtès <address@hidden>
Date:   Mon Mar 4 13:34:43 2019 +0100

    services: Use 'file-append' for user account shells.
    
    * gnu/services/cuirass.scm (cuirass-account): Use 'file-append' instead
    of #~(string-append #$shadow "/sbin/nologin").
    * gnu/services/monitoring.scm (zabbix-server-account): Likewise.
    (zabbix-agent-account): Likewise.
    * gnu/services/rsync.scm (rsync-account): Likewise.
    * gnu/services/ssh.scm (%openssh-accounts): Likewise.
---
 gnu/services/cuirass.scm    | 4 ++--
 gnu/services/monitoring.scm | 4 ++--
 gnu/services/rsync.scm      | 2 +-
 gnu/services/ssh.scm        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 36e90fc..f92d33b 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2017 Jan Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
@@ -136,7 +136,7 @@
            (system? #t)
            (comment "Cuirass privilege separation user")
            (home-directory (string-append "/var/lib/" cuirass-user))
-           (shell #~(string-append #$shadow "/sbin/nologin"))))))
+           (shell (file-append shadow "/sbin/nologin"))))))
 
 (define (cuirass-activation config)
   "Return the activation code for CONFIG."
diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm
index 685641f..611448b 100644
--- a/gnu/services/monitoring.scm
+++ b/gnu/services/monitoring.scm
@@ -258,7 +258,7 @@ configuration file."))
            (group zabbix-group)
            (comment "zabbix privilege separation user")
            (home-directory (string-append "/var/run/" zabbix-user))
-           (shell #~(string-append #$shadow "/sbin/nologin"))))))
+           (shell (file-append shadow "/sbin/nologin"))))))
 
 (define (zabbix-server-config-file config)
   "Return the zabbix-server configuration file corresponding to CONFIG."
@@ -387,7 +387,7 @@ configuration file."))
            (group zabbix-group)
            (comment "zabbix privilege separation user")
            (home-directory (string-append "/var/run/" zabbix-user))
-           (shell #~(string-append #$shadow "/sbin/nologin"))))))
+           (shell (file-append shadow "/sbin/nologin"))))))
 
 (define (zabbix-agent-activation config)
   "Return the activation gexp for CONFIG."
diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm
index 621e6c4..6c117bb 100644
--- a/gnu/services/rsync.scm
+++ b/gnu/services/rsync.scm
@@ -88,7 +88,7 @@
            (comment "rsyncd privilege separation user")
            (home-directory (string-append "/var/run/"
                                           rsync-user))
-           (shell #~(string-append #$shadow "/sbin/nologin"))))))
+           (shell (file-append shadow "/sbin/nologin"))))))
 
 (define (rsync-activation config)
   "Return the activation GEXP for CONFIG."
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 97b7f3c..362a7f1 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2016 Julien Lepiller <address@hidden>
 ;;; Copyright © 2017 Clément Lassieur <address@hidden>
@@ -349,7 +349,7 @@ The other options should be self-descriptive."
           (system? #t)
           (comment "sshd privilege separation user")
           (home-directory "/var/run/sshd")
-          (shell #~(string-append #$shadow "/sbin/nologin")))))
+          (shell (file-append shadow "/sbin/nologin")))))
 
 (define (openssh-activation config)
   "Return the activation GEXP for CONFIG."