diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/avahi.scm | 4 | ||||
| -rw-r--r-- | gnu/services/base.scm | 4 | ||||
| -rw-r--r-- | gnu/services/cuirass.scm | 4 | ||||
| -rw-r--r-- | gnu/services/science.scm | 18 | ||||
| -rw-r--r-- | gnu/services/security-token.scm | 3 | ||||
| -rw-r--r-- | gnu/services/ssh.scm | 18 |
6 files changed, 31 insertions, 20 deletions
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm index 54656708ca..7812191cb2 100644 --- a/gnu/services/avahi.scm +++ b/gnu/services/avahi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -130,7 +130,7 @@ (list (shepherd-service (documentation "Run the Avahi mDNS/DNS-SD responder.") (provision '(avahi-daemon)) - (requirement '(dbus-system networking)) + (requirement '(user-processes dbus-system networking)) (start #~(make-forkexec-constructor (list #$(file-append avahi "/sbin/avahi-daemon") diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 709d011f53..8449d924af 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1825,7 +1825,9 @@ raise a deprecation warning if the 'compression-level' field was used." advertise?) (list (shepherd-service (provision '(guix-publish)) - (requirement '(guix-daemon)) + (requirement `(user-processes + guix-daemon + ,@(if advertise? '(avahi-daemon) '()))) (start #~(make-forkexec-constructor (list #$(file-append guix "/bin/guix") "publish" "-u" "guix-publish" diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index a50f583807..7706ed41c6 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -69,6 +69,8 @@ (default "cuirass")) (interval cuirass-configuration-interval ;integer (seconds) (default 60)) + (queue-size cuirass-configuration-queue-size + (default 1)) (database cuirass-configuration-database ;string (file-name) (default "/var/lib/cuirass/cuirass.db")) (port cuirass-configuration-port ;integer (port) @@ -98,6 +100,7 @@ (user (cuirass-configuration-user config)) (group (cuirass-configuration-group config)) (interval (cuirass-configuration-interval config)) + (queue-size (cuirass-configuration-queue-size config)) (database (cuirass-configuration-database config)) (ttl (cuirass-configuration-ttl config)) (port (cuirass-configuration-port config)) @@ -119,6 +122,7 @@ "--database" #$database "--ttl" #$(string-append (number->string ttl) "s") "--interval" #$(number->string interval) + "--queue-size" #$(number->string queue-size) #$@(if queries-log-file (list (string-append "--log-queries=" queries-log-file)) diff --git a/gnu/services/science.scm b/gnu/services/science.scm index 94ff0f36f2..6f7ac91154 100644 --- a/gnu/services/science.scm +++ b/gnu/services/science.scm @@ -1,3 +1,21 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + (define-module (gnu services science) #:export (<rshiny-configuration> rshiny-configuration diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index 354549b33c..ec26006538 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,7 @@ (modules '((gnu build shepherd))) (start #~(lambda _ (invoke #$(file-append pcsc-lite "/sbin/pcscd")) - (call-with-input-file "/var/run/pcscd/pcscd.pid" read))) + (call-with-input-file "/run/pcscd/pcscd.pid" read))) (stop #~(make-kill-destructor))))))) (define pcscd-activation diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 1e45495e1b..1891db0487 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, 2019, 2020 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> @@ -33,9 +33,6 @@ #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) - #:use-module ((guix i18n) #:select (G_)) - #:use-module ((guix diagnostics) #:select (warning source-properties->location)) - #:use-module ((guix memoization) #:select (mlambda)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -279,16 +276,6 @@ The other options should be self-descriptive." ;;; OpenSSH. ;;; -(define true-but-soon-false - (mlambda (loc) - ;; The plan is to change the default 'password-authentication?' to #f in - ;; Guix 1.3.0 or so. See <https://issues.guix.gnu.org/44808>. - (warning (source-properties->location loc) - (G_ "The default value of the 'password-authentication?' -field of 'openssh-configuration' will change from #true to #false in the -future. Explicitly set it to #true to allow password authentication.~%")) - #t)) - (define-record-type* <openssh-configuration> openssh-configuration make-openssh-configuration openssh-configuration? @@ -309,8 +296,7 @@ future. Explicitly set it to #true to allow password authentication.~%")) (default #f)) ;; Boolean (password-authentication? openssh-configuration-password-authentication? - (default (true-but-soon-false - (current-source-location)))) + (default #t)) ;; Boolean (public-key-authentication? openssh-configuration-public-key-authentication? (default #t)) |