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

nixos/acme: turn around test probes' dependencies

Browse Source 
Reads a bit more naturally, and now the changes to the
acme-${cert}.service actually reflect what would be needed were you to
do the same in production.

e.g.  "for dns-01, your service that needs the cert needs to pull in the
cert"
This commit is contained in:
Arian van Putten 2020-04-14 14:34:46 +02:00
parent 63d98cab9b
commit 61f834833b
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/tests/acme.nix
View File

@ -48,10 +48,9 @@ in import ./make-test-python.nix ({ lib, ... }: {
security.acme.certs."standalone.test" = { security.acme.certs."standalone.test" = {
webroot = "/var/lib/acme/acme-challenges"; webroot = "/var/lib/acme/acme-challenges";
}; };
systemd.targets."acme-finished-standalone.test" = {}; systemd.targets."acme-finished-standalone.test" = {
systemd.services."acme-standalone.test" = { after = [ "acme-standalone.test.service" ];
wants = [ "acme-finished-standalone.test.target" ]; wantedBy = [ "acme-standalone.test.service" ];
before = [ "acme-finished-standalone.test.target" ];
}; };
services.nginx.enable = true; services.nginx.enable = true;
services.nginx.virtualHosts."standalone.test" = { services.nginx.virtualHosts."standalone.test" = {
@ -68,10 +67,11 @@ in import ./make-test-python.nix ({ lib, ... }: {
# A target remains active. Use this to probe the fact that # A target remains active. Use this to probe the fact that
# a service fired eventhough it is not RemainAfterExit # a service fired eventhough it is not RemainAfterExit
systemd.targets."acme-finished-a.example.test" = {}; systemd.targets."acme-finished-a.example.test" = {
after = [ "acme-a.example.test.service" ];
wantedBy = [ "acme-a.example.test.service" ];
};
systemd.services."acme-a.example.test" = { systemd.services."acme-a.example.test" = {
wants = [ "acme-finished-a.example.test.target" ];
before = [ "acme-finished-a.example.test.target" ];
after = [ "nginx.service" ]; after = [ "nginx.service" ];
}; };
@ -89,10 +89,11 @@ in import ./make-test-python.nix ({ lib, ... }: {
security.acme.server = "https://acme.test/dir"; security.acme.server = "https://acme.test/dir";
specialisation.second-cert.configuration = {pkgs, ...}: { specialisation.second-cert.configuration = {pkgs, ...}: {
systemd.targets."acme-finished-b.example.test" = {}; systemd.targets."acme-finished-b.example.test" = {
after = [ "acme-b.example.test.service" ];
wantedBy = [ "acme-b.example.test.service" ];
};
systemd.services."acme-b.example.test" = { systemd.services."acme-b.example.test" = {
wants = [ "acme-finished-b.example.test.target" ];
before = [ "acme-finished-b.example.test.target" ];
after = [ "nginx.service" ]; after = [ "nginx.service" ];
}; };
services.nginx.virtualHosts."b.example.test" = { services.nginx.virtualHosts."b.example.test" = {
@ -115,10 +116,12 @@ in import ./make-test-python.nix ({ lib, ... }: {
user = config.services.nginx.user; user = config.services.nginx.user;
group = config.services.nginx.group; group = config.services.nginx.group;
}; };
systemd.targets."acme-finished-example.test" = {}; systemd.targets."acme-finished-example.test" = {
after = [ "acme-example.test.service" ];
wantedBy = [ "acme-example.test.service" ];
};
systemd.services."acme-example.test" = { systemd.services."acme-example.test" = {
wants = [ "acme-finished-example.test.target" ]; before = [ "nginx.service" ];
before = [ "acme-finished-example.test.target" "nginx.service" ];
wantedBy = [ "nginx.service" ]; wantedBy = [ "nginx.service" ];
}; };
services.nginx.virtualHosts."c.example.test" = { services.nginx.virtualHosts."c.example.test" = {