nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/tests/acme.nix: remove pebble custom endpoint patch

Browse Source 
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.
This commit is contained in:
Félix Baylac-Jacqué 2019-10-26 00:45:19 +02:00
parent 5671fa2396
commit 781f0cf2ec
3 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/tests/acme.nix
View File

@ -12,8 +12,11 @@ in import ./make-test.nix {
networking.extraHosts = ''
${config.networking.primaryIPAddress} standalone.com
'';
security.acme.certs."standalone.com" = {
webroot = "/var/lib/acme/acme-challenges";
security.acme = {
server = "https://acme-v02.api.letsencrypt.org/dir";
certs."standalone.com" = {
webroot = "/var/lib/acme/acme-challenges";
};
};
systemd.targets."acme-finished-standalone.com" = {};
systemd.services."acme-standalone.com" = {
@ -54,6 +57,8 @@ in import ./make-test.nix {
'';
};
security.acme.server = "https://acme-v02.api.letsencrypt.org/dir";
nesting.clone = [
({pkgs, ...}: {

25
nixos/tests/common/letsencrypt/0001-Change-ACME-directory-endpoint-to-directory.patch
View File

@ -1,25 +0,0 @@
From c3b4004386074342d22cab5e129c1f7e623f4272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Mon, 21 Oct 2019 10:56:13 +0200
Subject: [PATCH] Change ACME directory endpoint to /directory
---
wfe/wfe.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wfe/wfe.go b/wfe/wfe.go
index e24797f..10d29fb 100644
--- a/wfe/wfe.go
+++ b/wfe/wfe.go
@@ -39,7 +39,7 @@ const (
// Note: We deliberately pick endpoint paths that differ from Boulder to
// exercise clients processing of the /directory response
// We export the DirectoryPath so that the pebble binary can reference it
- DirectoryPath = "/dir"
+ DirectoryPath = "/directory"
noncePath = "/nonce-plz"
newAccountPath = "/sign-me-up"
acctPath = "/my-account/"
--
2.23.0

12
nixos/tests/common/letsencrypt/default.nix
View File

@ -62,17 +62,7 @@ let
siteDomain = "letsencrypt.org";
siteCertFile = snakeOilCerts.${siteDomain}.cert;
siteKeyFile = snakeOilCerts.${siteDomain}.key;
pebble = pkgs.pebble.overrideAttrs (attrs: {
# The pebble directory endpoint is /dir when the bouder (official
# ACME server) is /directory. Sadly, this endpoint is hardcoded,
# we have to patch it.
#
# Tried to upstream, that said upstream maintainers rather keep
# this custom endpoint to test ACME clients robustness. See
# https://github.com/letsencrypt/pebble/issues/283#issuecomment-545123242
patches = [ ./0001-Change-ACME-directory-endpoint-to-directory.patch ];
});
pebble = pkgs.pebble;
resolver = let
message = "You need to define a resolver for the letsencrypt test module.";
firstNS = lib.head config.networking.nameservers;