git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/tests/acme.nix: remove pebble custom endpoint patch

The recent custom endpoint addition allows us to directly point certbot to the custom Pebble directory endpoint. Thanks to that, we can ditch the Pebble patch we were using so far; making this test maintenance easier.

commit781f0cf2ec3d18afa7e9f276ea87da4017934fee authorFélix Baylac-Jacqué <felix@alternativebit.fr> dateSat 26 Oct 2019, 00:45 (7 years ago) parent5671fa2
3 files changed+8−38
nixos/tests/acme.nix+7−2 nixos/tests/common/letsencrypt/0001-Change-ACME-directory-endpoint-to-directory.patch−25 nixos/tests/common/letsencrypt/default.nix+1−11
nixos/tests/acme.nix+7−2
@@ -12,8 +12,11 @@ in import ./make-test.nix {
1212 networking.extraHosts = ''
1313 ${config.networking.primaryIPAddress} standalone.com
1414 '';
15− security.acme.certs."standalone.com" = {
16− webroot = "/var/lib/acme/acme-challenges";
15+ security.acme = {
16+ server = "https://acme-v02.api.letsencrypt.org/dir";
17+ certs."standalone.com" = {
18+ webroot = "/var/lib/acme/acme-challenges";
19+ };
1720 };
1821 systemd.targets."acme-finished-standalone.com" = {};
1922 systemd.services."acme-standalone.com" = {
@@ -54,6 +57,8 @@ in import ./make-test.nix {
5457 '';
5558 };
5659
60+ security.acme.server = "https://acme-v02.api.letsencrypt.org/dir";
61+
5762 nesting.clone = [
5863 ({pkgs, ...}: {
5964
nixos/tests/common/letsencrypt/0001-Change-ACME-directory-endpoint-to-directory.patchdeleted−25
@@ -1,25 +0,0 @@
1−From c3b4004386074342d22cab5e129c1f7e623f4272 Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
3−Date: Mon, 21 Oct 2019 10:56:13 +0200
4−Subject: [PATCH] Change ACME directory endpoint to /directory
5−
6−---
7− wfe/wfe.go | 2 +-
8− 1 file changed, 1 insertion(+), 1 deletion(-)
9−
10−diff --git a/wfe/wfe.go b/wfe/wfe.go
11−index e24797f..10d29fb 100644
12−--- a/wfe/wfe.go
13−+++ b/wfe/wfe.go
14−@@ -39,7 +39,7 @@ const (
15− // Note: We deliberately pick endpoint paths that differ from Boulder to
16− // exercise clients processing of the /directory response
17− // We export the DirectoryPath so that the pebble binary can reference it
18−- DirectoryPath = "/dir"
19−+ DirectoryPath = "/directory"
20− noncePath = "/nonce-plz"
21− newAccountPath = "/sign-me-up"
22− acctPath = "/my-account/"
23−--
24−2.23.0
25−
nixos/tests/common/letsencrypt/default.nix+1−11
@@ -62,17 +62,7 @@ let
6262 siteDomain = "letsencrypt.org";
6363 siteCertFile = snakeOilCerts.${siteDomain}.cert;
6464 siteKeyFile = snakeOilCerts.${siteDomain}.key;
65− pebble = pkgs.pebble.overrideAttrs (attrs: {
66− # The pebble directory endpoint is /dir when the bouder (official
67− # ACME server) is /directory. Sadly, this endpoint is hardcoded,
68− # we have to patch it.
69− #
70− # Tried to upstream, that said upstream maintainers rather keep
71− # this custom endpoint to test ACME clients robustness. See
72− # https://github.com/letsencrypt/pebble/issues/283#issuecomment-545123242
73− patches = [ ./0001-Change-ACME-directory-endpoint-to-directory.patch ];
74− });
75−
65+ pebble = pkgs.pebble;
7666 resolver = let
7767 message = "You need to define a resolver for the letsencrypt test module.";
7868 firstNS = lib.head config.networking.nameservers;