Skynet/misc_nixos-mailserver
7
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Qualify user names

Browse source
This commit is contained in:
John Boehr 2017-11-09 14:17:03 -08:00
parent bbca0bd678
commit f372754052
No known key found for this signature in database
GPG key ID: 73B8EFB60708F699
7 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mail-server/nginx.nix
View file

@ -26,11 +26,11 @@ let
acmeRoot = "/var/lib/acme/acme-challenge";
in
{
config = with cfg; lib.mkIf (certificateScheme == 3) {
config = lib.mkIf (cfg.certificateScheme == 3) {
services.nginx = {
enable = true;
virtualHosts = genAttrs allDomains (domain: {
serverName = "${hostPrefix}.${domain}";
virtualHosts = genAttrs (map (domain: "${cfg.hostPrefix}.${domain}") allDomains) (domain: {
serverName = "${domain}";
forceSSL = true;
enableACME = true;
locations."/" = {
@ -40,11 +40,8 @@ in
});
};
security.acme.certs."mailserver" = {
# @todo what user/group should this run as?
user = "postfix"; # cfg.user;
group = "postfix"; # lib.mkDefault cfg.group;
domain = "${hostPrefix}.${domain}";
extraDomains = map (domain: "${hostPrefix}.${domain}") extraDomains;
domain = "${cfg.hostPrefix}.${cfg.domain}";
extraDomains = genAttrs (map (domain: "${cfg.hostPrefix}.${domain}") cfg.extraDomains) (domain: null);
webroot = acmeRoot;
# @todo should we reload postfix here?
postRun = ''