Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

acme: Fix test #36571

Merged
merged 2 commits into from
Mar 12, 2018
Merged

acme: Fix test #36571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd35580
nixos/tests/acme: go compat update, unvendor pkcs11
srhb Mar 8, 2018
df3706c
nixos/tests/acme: use mail-test-srv tls certs from source
srhb Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions nixos/tests/common/letsencrypt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,16 @@ let
boulder = let
owner = "letsencrypt";
repo = "boulder";
rev = "9866abab8962a591f06db457a4b84c518cc88243";
version = "20170510";
rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a";
version = "20180129";

in pkgs.buildGoPackage rec {
name = "${repo}-${version}";

src = pkgs.fetchFromGitHub {
name = "${name}-src";
inherit rev owner repo;
sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1";
sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55";
};

postPatch = ''
Expand All @@ -168,6 +168,18 @@ let
cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
'';

# Until vendored pkcs11 is go 1.9 compatible
preBuild = ''
rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11
'';

extraSrcs = map mkGoDep [
{ goPackagePath = "github.com/miekg/pkcs11";
rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83";
sha256 = "1m8g6fx7df6hf6q6zsbyw1icjmm52dmsx28rgb0h930wagvngfwb";
}
];

goPackagePath = "github.com/${owner}/${repo}";
buildInputs = [ pkgs.libtool ];
};
Expand Down Expand Up @@ -284,7 +296,11 @@ let
ocsp-updater.after = [ "boulder-publisher" ];
ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json";
ct-test-srv = {};
mail-test-srv.args = "--closeFirst 5";
mail-test-srv.args = let
key = "${boulderSource}/test/mail-test-srv/minica-key.pem";
crt = "${boulderSource}/test/mail-test-srv/minica.pem";
in
"--closeFirst 5 --cert ${crt} --key ${key}";
};

commonPath = [ softhsm pkgs.mariadb goose boulder ];
Expand Down