git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108819 from SuperSandro2000/nginx-module
commitfccda5aae6659e8abce91503194d618c2bfc6e59 authorSandro <sandro.jaeckel@gmail.com> dateSat 30 Jan 2021, 21:46 (6 years ago) parent5be9ec47856011
2 files changed+4−4
nixos/modules/security/acme.nix+3−3 nixos/modules/services/web-servers/apache-httpd/vhost-options.nix+1−1
nixos/modules/security/acme.nix+3−3
@@ -346,7 +346,7 @@ let
346346 webroot = mkOption {
347347 type = types.nullOr types.str;
348348 default = null;
349− example = "/var/lib/acme/acme-challenges";
349+ example = "/var/lib/acme/acme-challenge";
350350 description = ''
351351 Where the webroot of the HTTP vhost is located.
352352 <filename>.well-known/acme-challenge/</filename> directory
@@ -579,12 +579,12 @@ in {
579579 example = literalExample ''
580580 {
581581 "example.com" = {
582− webroot = "/var/www/challenges/";
582+ webroot = "/var/lib/acme/acme-challenge/";
583583 email = "foo@example.com";
584584 extraDomainNames = [ "www.example.com" "foo.example.com" ];
585585 };
586586 "bar.example.com" = {
587− webroot = "/var/www/challenges/";
587+ webroot = "/var/lib/acme/acme-challenge/";
588588 email = "bar@example.com";
589589 };
590590 }
nixos/modules/services/web-servers/apache-httpd/vhost-options.nix+1−1
@@ -112,7 +112,7 @@ in
112112
113113 acmeRoot = mkOption {
114114 type = types.str;
115− default = "/var/lib/acme/acme-challenges";
115+ default = "/var/lib/acme/acme-challenge";
116116 description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
117117 };
118118