JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #108819 from SuperSandro2000/nginx-module

Browse Source
This commit is contained in:
Sandro 2021-01-30 21:46:35 +01:00 committed by GitHub
commit fccda5aae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/security/acme.nix
View File

@ -346,7 +346,7 @@ let
webroot = mkOption { webroot = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "/var/lib/acme/acme-challenges"; example = "/var/lib/acme/acme-challenge";
description = '' description = ''
Where the webroot of the HTTP vhost is located. Where the webroot of the HTTP vhost is located.
<filename>.well-known/acme-challenge/</filename> directory <filename>.well-known/acme-challenge/</filename> directory
@ -579,12 +579,12 @@ in {
example = literalExample '' example = literalExample ''
{ {
"example.com" = { "example.com" = {
webroot = "/var/www/challenges/"; webroot = "/var/lib/acme/acme-challenge/";
email = "foo@example.com"; email = "foo@example.com";
extraDomainNames = [ "www.example.com" "foo.example.com" ]; extraDomainNames = [ "www.example.com" "foo.example.com" ];
}; };
"bar.example.com" = { "bar.example.com" = {
webroot = "/var/www/challenges/"; webroot = "/var/lib/acme/acme-challenge/";
email = "bar@example.com"; email = "bar@example.com";
}; };
} }

2
nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
View File

@ -112,7 +112,7 @@ in
acmeRoot = mkOption { acmeRoot = mkOption {
type = types.str; 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"; description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
}; };