1c1 < From 247843cb62c36cf0a65064eb0dcf5559dc78a460 Mon Sep 17 00:00:00 2001 --- > From b56b797e2ca26619485d874110d3f1f0ae96fba4 Mon Sep 17 00:00:00 2001 4c4 < Subject: [PATCH] gnu: services: Nginx configs can reference store --- > Subject: [PATCH 1/5] gnu: services: Nginx configs can reference store 16,17c16,17 < gnu/services/web.scm | 158 +++++++++++++++++++++++++-------------------------- < 1 file changed, 78 insertions(+), 80 deletions(-) --- > gnu/services/web.scm | 150 +++++++++++++++++++++++++-------------------------- > 1 file changed, 74 insertions(+), 76 deletions(-) 20c20 < index c605d7686..6e7ffa787 100644 --- > index b7b2f67f1..e8769522a 100644 23c23 < @@ -114,105 +114,103 @@ --- > @@ -110,101 +110,99 @@ 82,86c82,83 < - (let ((certificate (nginx-server-configuration-ssl-certificate server))) < - ;; lstat fails when the certificate file does not exist: it aborts < - ;; and lets the user fix their configuration. < - (lstat certificate) < - (string-append " ssl_certificate " certificate ";\n")) --- > - (string-append " ssl_certificate " > - (nginx-server-configuration-ssl-certificate server) ";\n") 89,91c86,87 < - (let ((key (nginx-server-configuration-ssl-certificate-key server))) < - (lstat key) < - (string-append " ssl_certificate_key " key ";\n")) --- > - (string-append " ssl_certificate_key " > - (nginx-server-configuration-ssl-certificate-key server) ";\n") 120,123d115 < + (for-each (lambda (file) < + (if (and file (not (file-exists? file))) < + (error "~A does not exist" file))) < + (list ssl-certificate ssl-certificate-key)) 208c200 < 2.13.1 --- > 2.12.2