nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Jan Nieuwenhuizen 2019-10-04 17:03:24 +02:00
parent 0c3cf62829
commit 3a69dd5c15
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/guix.texi
View File

@ -19419,13 +19419,13 @@ Other services can also extend the @code{httpd-service-type} to add to
the configuration. the configuration.
@lisp @lisp
(simple-service 'my-extra-server httpd-service-type (simple-service 'www.example.com-server httpd-service-type
(list (list
(httpd-virtualhost (httpd-virtualhost
"*:80" "*:80"
(list (string-append (list (string-join '("ServerName www.example.com"
"ServerName "www.example.com "DocumentRoot /srv/http/www.example.com")
DocumentRoot \"/srv/http/www.example.com\""))))) "\n")))))
@end lisp @end lisp
@end deffn @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. These should be added to the extra-config for the httpd-service.
@lisp @lisp
(simple-service 'my-extra-server httpd-service-type (simple-service 'www.example.com-server httpd-service-type
(list (list
(httpd-virtualhost (httpd-virtualhost
"*:80" "*:80"
(list (string-append (list (string-join '("ServerName www.example.com"
"ServerName "www.example.com "DocumentRoot /srv/http/www.example.com")
DocumentRoot \"/srv/http/www.example.com\""))))) "\n")))))
@end lisp @end lisp
@table @asis @table @asis

2
gnu/services/web.scm
View File

@ -438,7 +438,7 @@
addresses-and-ports addresses-and-ports
contents) contents)
`(,(string-append `(,(string-append
"<VirtualHost " addresses-and-ports ">\n") "\n<VirtualHost " addresses-and-ports ">\n")
,@contents ,@contents
"\n</VirtualHost>\n")) "\n</VirtualHost>\n"))
((? string? x) ((? string? x)