3
0
Fork 0
forked from mirrors/nixpkgs

nixos/acme: Fix b.example.com test

This commit is contained in:
Lucas Savva 2020-02-09 11:34:17 +00:00
parent ac983cff48
commit 636eb23157
No known key found for this signature in database
GPG key ID: F9CE6D3DCDC78F2D
2 changed files with 2 additions and 3 deletions

View file

@ -333,9 +333,7 @@ in
chown '${data.user}:${data.group}' *.pem
fi
echo post stuff
${data.postRun}
echo done
'';
in
"+${script}";

View file

@ -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;