Merge pull request #108819 from SuperSandro2000/nginx-module

Sandro fccda5aa 5be9ec41

Changed files
+4 -4
nixos
modules
security
services
web-servers
apache-httpd
+3 -3
nixos/modules/security/acme.nix
···
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
···
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";
};
}
+1 -1
nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
···
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";
};