summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-04 13:34:43 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-04 15:22:58 +0100
commit56a93cb975ddc33d50183fb122e2aafda026f18e (patch)
treec75a0de4d5efc4e89f8fb7e49de774acf8aac0c3 /gnu
parent8bb76f3d44c1f5ffec8011819494db306a51d801 (diff)
downloadpatches-56a93cb975ddc33d50183fb122e2aafda026f18e.tar
patches-56a93cb975ddc33d50183fb122e2aafda026f18e.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/cuirass.scm4
-rw-r--r--gnu/services/monitoring.scm4
-rw-r--r--gnu/services/rsync.scm2
-rw-r--r--gnu/services/ssh.scm4
4 files changed, 7 insertions, 7 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 36e90fc825..f92d33bf94 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 <mthl@gnu.org>
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
@@ -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 685641f110..611448b733 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 621e6c46d4..6c117bbda4 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 97b7f3c07b..362a7f1490 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 <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
@@ -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."