diff options
| author | Clément Lassieur <clement@lassieur.org> | 2017-12-09 12:59:12 +0100 |
|---|---|---|
| committer | Clément Lassieur <clement@lassieur.org> | 2017-12-18 12:03:14 +0100 |
| commit | 8b223ceac4ff0781e95d69362875f87cff03f4d6 (patch) | |
| tree | 4a501621f9a6d30c314552fe1944cfbc2f5f70c0 /gnu/tests/web.scm | |
| parent | f1a2b1cb20cdc0c7f3e58bab4acea39eabfbd5a5 (diff) | |
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/web.scm')
| -rw-r--r-- | gnu/tests/web.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index e975cb8300e..f1214fb5fd6 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> | 3 | ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> |
| 4 | ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -47,7 +48,7 @@ | |||
| 47 | ;; Server blocks. | 48 | ;; Server blocks. |
| 48 | (list (nginx-server-configuration | 49 | (list (nginx-server-configuration |
| 49 | (root "/srv") | 50 | (root "/srv") |
| 50 | (http-port 8042)))) | 51 | (listen '("8042" "443 ssl"))))) |
| 51 | 52 | ||
| 52 | (define %nginx-os | 53 | (define %nginx-os |
| 53 | ;; Operating system under test. | 54 | ;; Operating system under test. |
| @@ -153,8 +154,7 @@ echo(\"Computed by php:\".((string)(2+3))); | |||
| 153 | (root "/srv") | 154 | (root "/srv") |
| 154 | (locations | 155 | (locations |
| 155 | (list (nginx-php-location))) | 156 | (list (nginx-php-location))) |
| 156 | (http-port 8042) | 157 | (listen "8042") |
| 157 | (https-port #f) | ||
| 158 | (ssl-certificate #f) | 158 | (ssl-certificate #f) |
| 159 | (ssl-certificate-key #f)))) | 159 | (ssl-certificate-key #f)))) |
| 160 | 160 | ||
