From: Christopher Baines <mail@cbaines.net>
To: 29741@debbugs.gnu.org
Subject: [bug#29741] [PATCH 1/2] gnu: tests: web: Generalise the test data for the nginx test.
Date: Sat, 16 Dec 2017 20:16:59 +0000 [thread overview]
Message-ID: <20171216201700.23564-1-mail@cbaines.net> (raw)
In-Reply-To: <handler.29741.B.15134551667792.ack@debbugs.gnu.org>
So that it can also be used for other web servers.
* gnu/tests/web.scm (%index.html-contents): Change nginx to guix.
(%make-http-root): Move the index.html file from /srv to /srv/http.
(%nginx-servers): Remove the setting of root.
---
gnu/tests/web.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index e975cb830..b84f072ac 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -32,21 +32,21 @@
%test-php-fpm))
(define %index.html-contents
- ;; Contents of the /index.html file served by nginx.
- "Hello, nginx!")
+ ;; Contents of the /index.html file served by apache-httpd.
+ "Hello, guix!")
(define %make-http-root
;; Create our server root in /srv.
#~(begin
(mkdir "/srv")
- (call-with-output-file "/srv/index.html"
+ (mkdir "/srv/http")
+ (call-with-output-file "/srv/http/index.html"
(lambda (port)
(display #$%index.html-contents port)))))
(define %nginx-servers
;; Server blocks.
(list (nginx-server-configuration
- (root "/srv")
(http-port 8042))))
(define %nginx-os
--
2.14.1
next parent reply other threads:[~2017-12-16 20:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <handler.29741.B.15134551667792.ack@debbugs.gnu.org>
2017-12-16 20:16 ` Christopher Baines [this message]
2017-12-16 20:17 ` [bug#29741] [PATCH 2/2] gnu: services: web: Add service for apache-httpd Christopher Baines
2017-12-18 10:10 ` Ludovic Courtès
2017-12-19 8:03 ` Christopher Baines
2017-12-24 18:01 ` [bug#29741] [PATCH 1/2] gnu: tests: web: Generalise the nginx test Christopher Baines
2017-12-24 18:01 ` [bug#29741] [PATCH 2/2] gnu: services: web: Add service for httpd Christopher Baines
2017-12-16 20:12 ` [bug#29741] [PATCH] gnu: services: web: Add service for apache-httpd Christopher Baines
2018-01-11 9:46 ` [bug#29741] [PATCH 2/2] gnu: services: web: Add service for httpd Ludovic Courtès
2018-01-17 8:45 ` bug#29741: " Christopher Baines
2017-12-24 18:08 ` [bug#29741] [PATCH 2/2] gnu: services: web: Add service for apache-httpd Christopher Baines
2017-12-18 10:02 ` [bug#29741] [PATCH 1/2] gnu: tests: web: Generalise the test data for the nginx test Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171216201700.23564-1-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=29741@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.