[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: httpd: Fix virtual-host doc and config.
From: |
guix-commits |
Subject: |
01/01: services: httpd: Fix virtual-host doc and config. |
Date: |
Fri, 4 Oct 2019 11:11:09 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit 3a69dd5c1558caa295b22476bbf00d88e62e81a8
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Oct 4 17:03:24 2019 +0200
services: httpd: Fix virtual-host doc and config.
* doc/guix.texi (Web Services): Fix httpd-virtualhost examples.
* gnu/services/web.scm (httpd-process-extensions): Add missing newline
separator.
---
doc/guix.texi | 16 ++++++++--------
gnu/services/web.scm | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 93139e2..b49934d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19419,13 +19419,13 @@ Other services can also extend the
@code{httpd-service-type} to add to
the configuration.
@lisp
-(simple-service 'my-extra-server httpd-service-type
+(simple-service 'www.example.com-server httpd-service-type
(list
(httpd-virtualhost
"*:80"
- (list (string-append
- "ServerName "www.example.com
- DocumentRoot \"/srv/http/www.example.com\"")))))
+ (list (string-join '("ServerName www.example.com"
+ "DocumentRoot
/srv/http/www.example.com")
+ "\n")))))
@end lisp
@end deffn
@@ -19559,13 +19559,13 @@ This data type represents a virtualhost configuration
block for the httpd servic
These should be added to the extra-config for the httpd-service.
@lisp
-(simple-service 'my-extra-server httpd-service-type
+(simple-service 'www.example.com-server httpd-service-type
(list
(httpd-virtualhost
"*:80"
- (list (string-append
- "ServerName "www.example.com
- DocumentRoot \"/srv/http/www.example.com\"")))))
+ (list (string-join '("ServerName www.example.com"
+ "DocumentRoot
/srv/http/www.example.com")
+ "\n")))))
@end lisp
@table @asis
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 5697123..899be1c 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -438,7 +438,7 @@
addresses-and-ports
contents)
`(,(string-append
- "<VirtualHost " addresses-and-ports ">\n")
+ "\n<VirtualHost " addresses-and-ports ">\n")
,@contents
"\n</VirtualHost>\n"))
((? string? x)