summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/avahi.scm2
-rw-r--r--gnu/services/databases.scm8
-rw-r--r--gnu/services/desktop.scm29
-rw-r--r--gnu/services/getmail.scm21
4 files changed, 45 insertions, 15 deletions
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 547d826551..54656708ca 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -175,7 +175,7 @@ service switch (NSS) with support for @code{.local} host name resolution.")
avahi-service-type
"Return a service that runs @command{avahi-daemon}, a system-wide
mDNS/DNS-SD responder that allows for service discovery and
-\"zero-configuration\" host name lookups (see @uref{http://avahi.org/}), and
+\"zero-configuration\" host name lookups (see @uref{https://avahi.org/}), and
extends the name service cache daemon (nscd) so that it can resolve
@code{.local} host names using
@uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}. Additionally,
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index ec31489d48..473ece4e97 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -463,7 +463,8 @@ storage:
mysql-configuration make-mysql-configuration
mysql-configuration?
(mysql mysql-configuration-mysql (default mariadb))
- (port mysql-configuration-port (default 3306)))
+ (port mysql-configuration-port (default 3306))
+ (extra-content mysql-configuration-extra-content (default "")))
(define %mysql-accounts
(list (user-group
@@ -478,11 +479,12 @@ storage:
(define mysql-configuration-file
(match-lambda
- (($ <mysql-configuration> mysql port)
+ (($ <mysql-configuration> mysql port extra-content)
(mixed-text-file "my.cnf" "[mysqld]
datadir=/var/lib/mysql
socket=/run/mysqld/mysqld.sock
port=" (number->string port) "
+" extra-content "
"))))
(define (%mysql-activation config)
@@ -524,7 +526,7 @@ port=" (number->string port) "
(for-each
(lambda (sql)
(call-with-input-file
- (string-append #$mysql "/share/mysql/" sql)
+ (string-append #$mysql:lib "/share/mysql/" sql)
(lambda (in) (dump-port in p))))
'("mysql_system_tables.sql"
"mysql_performance_tables.sql"
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 1be05fda4e..9dcdf38be1 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.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>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
@@ -48,6 +48,7 @@
#:use-module (gnu packages xfce)
#:use-module (gnu packages avahi)
#:use-module (gnu packages xdisorg)
+ #:use-module (gnu packages scanner)
#:use-module (gnu packages suckless)
#:use-module (gnu packages linux)
#:use-module (gnu packages libusb)
@@ -109,6 +110,7 @@
accountsservice-service
cups-pk-helper-service-type
+ sane-service-type
gnome-desktop-configuration
gnome-desktop-configuration?
@@ -837,6 +839,29 @@ accountsservice web site} for more information."
;;;
+;;; Scanner access via SANE.
+;;;
+
+(define %sane-accounts
+ ;; The '60-libsane.rules' udev rules refers to the "scanner" group.
+ (list (user-group (name "scanner") (system? #t))))
+
+(define sane-service-type
+ (service-type
+ (name 'sane)
+ (description
+ "This service provides access to scanners @i{via}
+@uref{http://www.sane-project.org, SANE} by installing the necessary udev
+rules.")
+ (default-value sane-backends-minimal)
+ (extensions
+ (list (service-extension udev-service-type list)
+ (service-extension account-service-type
+ (const %sane-accounts))))))
+
+
+
+;;;
;;; GNOME desktop service.
;;;
@@ -1154,6 +1179,8 @@ or setting its password with passwd.")))
;; Add udev rules for MTP devices so that non-root users can access
;; them.
(simple-service 'mtp udev-service-type (list libmtp))
+ ;; Add udev rules for scanners.
+ (service sane-service-type)
;; Add polkit rules, so that non-root users in the wheel group can
;; perform administrative tasks (similar to "sudo").
polkit-wheel-service
diff --git a/gnu/services/getmail.scm b/gnu/services/getmail.scm
index b3d86cb65c..7d77888517 100644
--- a/gnu/services/getmail.scm
+++ b/gnu/services/getmail.scm
@@ -112,13 +112,13 @@
@samp{passwd} and @samp{static}.")
(server
(string 'unset)
- "Space separated list of arguments to the userdb driver.")
+ "Name or IP adddress of the server to retrieve mail from.")
(username
(string 'unset)
- "Space separated list of arguments to the userdb driver.")
+ "Username to login to the mail server with.")
(port
(non-negative-integer #f)
- "Space separated list of arguments to the userdb driver.")
+ "Port number to connect to.")
(password
(string "")
"Override fields from passwd.")
@@ -127,16 +127,16 @@
"Override fields from passwd.")
(keyfile
(string "")
- "PEM-formatted key file to use for the TLS negotiation")
+ "PEM-formatted key file to use for the TLS negotiation.")
(certfile
(string "")
- "PEM-formatted certificate file to use for the TLS negotiation")
+ "PEM-formatted certificate file to use for the TLS negotiation.")
(ca-certs
(string "")
- "CA certificates to use")
+ "CA certificates to use.")
(extra-parameters
(parameter-alist '())
- "Extra retriever parameters"))
+ "Extra retriever parameters."))
(define (serialize-getmail-destination-configuration field-name val)
(serialize-configuration val getmail-destination-configuration-fields))
@@ -203,11 +203,11 @@ session with the server. A value of @samp{0} disables this feature.")
"Getmail will record a log of its actions to the named file. A value of
@samp{\"\"} disables this feature.")
(message-log-syslog
- (boolean #t)
+ (boolean #f)
"If true, getmail will record a log of its actions using the system
logger.")
(message-log-verbose
- (boolean #t)
+ (boolean #f)
"If true, getmail will log information about messages not retrieved and the
reason for not retrieving them, as well as starting and ending information
lines.")
@@ -360,7 +360,8 @@ notifications. This depends on the server supporting the IDLE extension.")
(list #$@environment-variables)
#:log-file
#$(string-append "/var/log/getmail-"
- (symbol->string name)))))))
+ (symbol->string name))))
+ (stop #~(make-kill-destructor)))))
configs))
(define getmail-service-type