aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-02-14 19:05:45 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-14 19:05:45 +0100
commit7edafc884c2a21258541b17a231051702c458263 (patch)
treed4202c8d6516bacd32fa55ee23c54b069ef8abd6 /gnu/services
parent89da127035737bdf922bc566970c5506c2e01b00 (diff)
parent64fc4f3705423c83c680a95d8dea81a39fce9a70 (diff)
downloadguix-7edafc884c2a21258541b17a231051702c458263.tar
guix-7edafc884c2a21258541b17a231051702c458263.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/desktop.scm2
-rw-r--r--gnu/services/web.scm4
2 files changed, 5 insertions, 1 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 9dcdf38be1..1294d748ac 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -1070,7 +1070,7 @@ as expected.")))
(match-lambda
(($ <inputattach-configuration> type device baud-rate log-file)
(let ((args (append (if baud-rate
- (list "--baud-rate" (number->string baud-rate))
+ (list "--baud" (number->string baud-rate))
'())
(list (string-append "--" type)
device))))
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 3ac7b7f52c..075140816a 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -1436,6 +1436,10 @@ ALLOWED_HOSTS = [
allowed-hosts))
"]
+DEFAULT_FROM_EMAIL = '" #$default-from-email "'
+SERVER_EMAIL = DEFAULT_FROM_EMAIL
+NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL
+
ADMINS = [
" #$(string-concatenate
(map (match-lambda