nixos/acme: Fix b.example.com test

vcunat · Feb 9, 2020 · 636eb23 · 636eb23
1 parent ac983cf
commit 636eb23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
@@ -333,9 +333,7 @@ in
                             chown '${data.user}:${data.group}' *.pem
                           fi
 
-                          echo post stuff
                           ${data.postRun}
-                          echo done
                         '';
                       in
                         "+${script}";

diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
@@ -63,7 +63,7 @@ in import ./make-test-python.nix {
       };
     };
 
-    webserver = { nodes, config, pkgs, lib, ... }: let parentConfig = config; in {
+    webserver = { nodes, config, pkgs, lib, ... }: {
       imports = [ commonConfig ];
       networking.firewall.allowedTCPPorts = [ 80 443 ];
       networking.nameservers = lib.mkForce [
@@ -97,6 +97,7 @@ in import ./make-test-python.nix {
           systemd.services."acme-b.example.com" = {
             wants = [ "acme-finished-b.example.com.target" ];
             before = [ "acme-finished-b.example.com.target" ];
+            after = [ "nginx.service" ];
           };
           services.nginx.virtualHosts."b.example.com" = {
             enableACME = true;