diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-30 21:46:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 21:46:35 +0100 |
| commit | fccda5aae6659e8abce91503194d618c2bfc6e59 (patch) | |
| tree | e922cdaef96bfee6122e16ee66d967a93ecebafe | |
| parent | 5be9ec41a3018a6e35cbf3370cf9d66773e8b609 (diff) | |
| parent | 7856011a30ac1f91d5b807d95004ea06f55f464b (diff) | |
Merge pull request #108819 from SuperSandro2000/nginx-module
| -rw-r--r-- | nixos/modules/security/acme.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/vhost-options.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 6b62e5043cafa..c33a92580d4cd 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -346,7 +346,7 @@ let webroot = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/acme/acme-challenges"; + example = "/var/lib/acme/acme-challenge"; description = '' Where the webroot of the HTTP vhost is located. <filename>.well-known/acme-challenge/</filename> directory @@ -579,12 +579,12 @@ in { example = literalExample '' { "example.com" = { - webroot = "/var/www/challenges/"; + webroot = "/var/lib/acme/acme-challenge/"; email = "foo@example.com"; extraDomainNames = [ "www.example.com" "foo.example.com" ]; }; "bar.example.com" = { - webroot = "/var/www/challenges/"; + webroot = "/var/lib/acme/acme-challenge/"; email = "bar@example.com"; }; } diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 173c0f8561c0f..394f9a305546c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -112,7 +112,7 @@ in acmeRoot = mkOption { type = types.str; - default = "/var/lib/acme/acme-challenges"; + default = "/var/lib/acme/acme-challenge"; description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here"; }; |