From bda38317eb3ad36be74ad08013afeaf55fe9066f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 13 Sep 2017 23:03:32 +0200
Subject: [PATCH] nixos/tests/letsencrypt: Fix nginx options

The enableSSL option has been deprecated in
a912a6a291eaa5f6a2ad9143c9e276779c357a41, so we switch to using onlySSL.

I've also explicitly disabled enableACME, because this is the default
and we don't actually want to have ACME enabled for a host which runs an
actual ACME server.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/common/letsencrypt.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
index 162f50385d8..5a2a266d4da 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt.nix
@@ -371,13 +371,15 @@ in {
     services.nginx.enable = true;
     services.nginx.recommendedProxySettings = true;
     services.nginx.virtualHosts.${wfeDomain} = {
-      enableSSL = true;
+      onlySSL = true;
+      enableACME = false;
       sslCertificate = wfeCertFile;
       sslCertificateKey = wfeKeyFile;
       locations."/".proxyPass = "http://127.0.0.1:80";
     };
     services.nginx.virtualHosts.${siteDomain} = {
-      enableSSL = true;
+      onlySSL = true;
+      enableACME = false;
       sslCertificate = siteCertFile;
       sslCertificateKey = siteKeyFile;
       locations.${tosPath}.extraConfig = "alias ${tosFile};";