Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch '#33_k9_mail_certs' into 'main'

Browse source 
added certs for k9 mail related subdomains

See merge request compsoc1/skynet/nixos!25
This commit is contained in:
silver 2023-10-26 00:25:27 +00:00
commit 0a89ac4526
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
applications/acme.nix
View file

@ -9,16 +9,24 @@ with lib; let
in {
imports = [];
options.skynet_acme = {
domains = lib.mkOption {
default = [];
type = lib.types.listOf lib.types.str;
description = ''
A list of domains to use for this server.
'';
options = {
skynet_acme = {
domains = lib.mkOption {
default = [];
type = lib.types.listOf lib.types.str;
description = ''
A list of domains to use for this server.
'';
};
domains_mail = lib.mkOption {
default = [];
type = lib.types.listOf lib.types.str;
description = ''
A list of domains to use for the mailserver.
'';
};
};
};
config = {
# group that will own the certificates
users.groups.acme = {};
@ -41,6 +49,10 @@ in {
domain = "skynet.ie";
extraDomainNames = cfg.domains;
};
"mail" = {
domain = "mail.skynet.ie";
extraDomainNames = cfg.domains_mail;
};
};
};
};

8
applications/email.nix
View file

@ -208,8 +208,10 @@ in {
age.secrets.ldap_pw.file = ../secrets/ldap/pw.age;
skynet_acme.domains = [
"${cfg.sub}.${cfg.domain}"
skynet_acme.domains_mail = [
"imap.skynet.ie"
"pop3.skynet.ie"
"smtp.skynet.ie"
];
# set up dns record for it
@ -307,7 +309,7 @@ in {
services.nginx.virtualHosts = {
"${cfg.sub}.${cfg.domain}" = {
forceSSL = true;
useACMEHost = "skynet";
useACMEHost = "mail";
# override the inbuilt nginx config
enableACME = false;
serverName = "${cfg.sub}.${cfg.domain}";