summaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2017-12-09 12:59:12 +0100
committerClément Lassieur <clement@lassieur.org>2017-12-18 12:03:14 +0100
commit8b223ceac4ff0781e95d69362875f87cff03f4d6 (patch)
tree4a501621f9a6d30c314552fe1944cfbc2f5f70c0 /gnu/tests
parentf1a2b1cb20cdc0c7f3e58bab4acea39eabfbd5a5 (diff)
downloadpatches-8b223ceac4ff0781e95d69362875f87cff03f4d6.tar
patches-8b223ceac4ff0781e95d69362875f87cff03f4d6.tar.gz
services: nginx: Replace 'http-port' and 'https-port' with 'listen'.
* doc/guix.texi (Web Services, Version Control Services): Update accordingly. * gnu/services/certbot.scm (certbot-nginx-server-configurations): Likewise. * gnu/services/version-control.scm (%cgit-configuration-nginx): Likewise. * gnu/services/web.scm (<nginx-server-configuration>, emit-nginx-server-config): Likewise. * gnu/tests/version-control.scm (%cgit-configuration-nginx, %git-nginx-configuration): Likewise. * gnu/tests/web.scm (%nginx-servers, %php-fpm-nginx-server-blocks): Likewise.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/version-control.scm7
-rw-r--r--gnu/tests/web.scm6
2 files changed, 6 insertions, 7 deletions
diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm
index 2cbacf0ef9..7367861b05 100644
--- a/gnu/tests/version-control.scm
+++ b/gnu/tests/version-control.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -78,8 +79,7 @@
"fastcgi_param HTTP_HOST $server_name;"
"fastcgi_pass 127.0.0.1:9000;")))))
(try-files (list "$uri" "@cgit"))
- (http-port 19418)
- (https-port #f)
+ (listen '("19418"))
(ssl-certificate #f)
(ssl-certificate-key #f))))
@@ -211,8 +211,7 @@ HTTP-PORT."
(server-blocks
(list
(nginx-server-configuration
- (http-port 19418)
- (https-port #f)
+ (listen '("19418"))
(ssl-certificate #f)
(ssl-certificate-key #f)
(locations
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index e975cb8300..f1214fb5fd 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
+;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,7 +48,7 @@
;; Server blocks.
(list (nginx-server-configuration
(root "/srv")
- (http-port 8042))))
+ (listen '("8042" "443 ssl")))))
(define %nginx-os
;; Operating system under test.
@@ -153,8 +154,7 @@ echo(\"Computed by php:\".((string)(2+3)));
(root "/srv")
(locations
(list (nginx-php-location)))
- (http-port 8042)
- (https-port #f)
+ (listen "8042")
(ssl-certificate #f)
(ssl-certificate-key #f))))