colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/acme: Fix b.example.com test

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/security/acme.nix
View File

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

3
nixos/tests/acme.nix
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 ]; imports = [ commonConfig ];
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.nameservers = lib.mkForce [ networking.nameservers = lib.mkForce [
@ -97,6 +97,7 @@ in import ./make-test-python.nix {
systemd.services."acme-b.example.com" = { systemd.services."acme-b.example.com" = {
wants = [ "acme-finished-b.example.com.target" ]; wants = [ "acme-finished-b.example.com.target" ];
before = [ "acme-finished-b.example.com.target" ]; before = [ "acme-finished-b.example.com.target" ];
after = [ "nginx.service" ];
}; };
services.nginx.virtualHosts."b.example.com" = { services.nginx.virtualHosts."b.example.com" = {
enableACME = true; enableACME = true;