diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-10-21 18:06:02 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-21 18:06:02 +0200 |
commit | ffddb42d6c510456997ee6de1c1b8026c9ce6d14 (patch) | |
tree | 5be4a965bb14f3de4af9f733f802b80840aff84c /gnu/tests/web.scm | |
parent | e381ae317c054a8ac52037c3f0df72ca3c96b91f (diff) | |
parent | 3a69b59332f02805fde2aee22b8f622c651f7007 (diff) | |
download | guix-ffddb42d6c510456997ee6de1c1b8026c9ce6d14.tar.gz guix-ffddb42d6c510456997ee6de1c1b8026c9ce6d14.zip |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/tests/web.scm')
-rw-r--r-- | gnu/tests/web.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 2e209fee97..319655396a 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -125,7 +125,7 @@ HTTP-PORT." (define %httpd-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service httpd-service-type (httpd-configuration (config @@ -154,7 +154,7 @@ HTTP-PORT." (define %nginx-os ;; Operating system under test. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service nginx-service-type (nginx-configuration (log-directory "/var/log/nginx") @@ -188,7 +188,7 @@ sub vcl_synth { (define %varnish-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) ;; Pretend to be a web server that serves %index.html-contents. (service varnish-service-type (varnish-configuration @@ -237,7 +237,7 @@ echo(\"Computed by php:\".((string)(2+3))); (define %php-fpm-os ;; Operating system under test. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service php-fpm-service-type) (service nginx-service-type (nginx-configuration @@ -392,7 +392,7 @@ HTTP-PORT, along with php-fpm." (define %hpcguix-web-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service hpcguix-web-service-type (hpcguix-web-configuration (specs %hpcguix-web-specs))))) @@ -407,7 +407,7 @@ HTTP-PORT, along with php-fpm." (define %tailon-os ;; Operating system under test. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service tailon-service-type (tailon-configuration (config-file |