diff options
author | Lucas Savva <lucas@m1cr0man.com> | 2021-11-28 17:03:31 +0000 |
---|---|---|
committer | Lucas Savva <lucas@m1cr0man.com> | 2021-12-26 16:44:10 +0000 |
commit | 377c6bcefce8e8ccd471892a1b24621d5a909457 (patch) | |
tree | 4914c740b10fb82ff157ef2071929ba2c3f8822a /nixos/tests/common/acme/server/default.nix | |
parent | a7f00013280416ce889d841e675526b8cb96a0ee (diff) | |
download | nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.tar nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.tar.gz nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.tar.bz2 nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.tar.lz nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.tar.xz nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.tar.zst nixpkgs-377c6bcefce8e8ccd471892a1b24621d5a909457.zip |
nixos/acme: Add defaults and inheritDefaults option
Allows configuring many default settings for certificates, all of which can still be overridden on a per-cert basis. Some options have been moved into .defaults from security.acme, namely email, server, validMinDays and renewInterval. These changes will not break existing configurations thanks to mkChangedOptionModule. With this, it is also now possible to configure DNS-01 with web servers whose virtualHosts utilise enableACME. The only requirement is you set `acmeRoot = null` for each vhost. The test suite has been revamped to cover these additions and also to generally make it easier to maintain. Test config for apache and nginx has been fully standardised, and it is now much easier to add a new web server if it follows the same configuration patterns as those two. I have also optimised the use of switch-to-configuration which should speed up testing.
Diffstat (limited to 'nixos/tests/common/acme/server/default.nix')
-rw-r--r-- | nixos/tests/common/acme/server/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix index 1c3bfdf76b7..450d49e6039 100644 --- a/nixos/tests/common/acme/server/default.nix +++ b/nixos/tests/common/acme/server/default.nix @@ -120,6 +120,11 @@ in { enable = true; description = "Pebble ACME server"; wantedBy = [ "network.target" ]; + environment = { + # We're not testing lego, we're just testing our configuration. + # No need to sleep. + PEBBLE_VA_NOSLEEP = "1"; + }; serviceConfig = { RuntimeDirectory = "pebble"; |