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

Merge pull request #179155 from linj-fork/caddy-improve-security

Browse Source 
nixos/caddy: improve security about acme certs
This commit is contained in:
Bernardo Meurer 2022-08-25 10:36:10 -03:00 committed by GitHub
commit d05ae63d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/web-servers/caddy/default.nix
View File

@ -308,7 +308,6 @@ in
StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ];
LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ];
Restart = "on-abnormal";
SupplementaryGroups = mkIf (length acmeVHosts != 0) [ "acme" ];
# TODO: attempt to upstream these options
NoNewPrivileges = true;
@ -331,9 +330,12 @@ in
security.acme.certs =
let
reloads = map (useACMEHost: nameValuePair useACMEHost { reloadServices = [ "caddy.service" ]; }) acmeHosts;
certCfg = map (useACMEHost: nameValuePair useACMEHost {
group = mkDefault cfg.group;
reloadServices = [ "caddy.service" ];
}) acmeHosts;
in
listToAttrs reloads;
listToAttrs certCfg;
};
}

4
nixos/modules/services/web-servers/caddy/vhost-options.nix
View File

@ -40,9 +40,7 @@ in
<emphasis>Note that this option does not create any certificates, nor
does it add subdomains to existing ones – you will need to create them
manually using <xref linkend="opt-security.acme.certs"/>. Additionally,
you should probably add the <literal>caddy</literal> user to the
<literal>acme</literal> group to grant access to the certificates.</emphasis>
manually using <xref linkend="opt-security.acme.certs"/>.</emphasis>
'';
};