diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-10-04 17:03:24 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-10-04 17:10:58 +0200 |
| commit | 3a69dd5c1558caa295b22476bbf00d88e62e81a8 (patch) | |
| tree | 6e1510c95c5215eb18ffeac41e21cf0862802823 | |
| parent | 0c3cf628299458dbbbd783adca5b1d277ead0fc8 (diff) | |
| download | guix-3a69dd5c1558caa295b22476bbf00d88e62e81a8.tar guix-3a69dd5c1558caa295b22476bbf00d88e62e81a8.tar.gz | |
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.
| -rw-r--r-- | doc/guix.texi | 16 | ||||
| -rw-r--r-- | gnu/services/web.scm | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 93139e2d05..b49934dc0e 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 56971238ab..899be1c168 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) |