gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(network): rename domain_dotless to uqdn

Browse source
This commit is contained in:
Kat Inskip 2022-09-25 20:20:49 -07:00
parent 4b2ffe160d
commit d38f578630
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/network.nix
View file

@ -175,7 +175,7 @@
type = nullOr str;
default = "kittywit.ch.";
};
domain_dotless = mkOption {
uqdn = mkOption {
type = nullOr str;
default = lib.removeSuffix "." config.target;
};

2
services/mail/dovecot.nix
View file

@ -95,7 +95,7 @@ in
}
protocol lmtp {
postmaster_address=postmaster@kittywit.ch
hostname=${config.networks.internet.domain_dotless}
hostname=${config.networks.internet.uqdn}
mail_plugins = $mail_plugins sieve
}
service auth {

4
services/mail/postfix.nix
View file

@ -3,7 +3,7 @@
let
publicCert = "daiyousei.kittywit.ch";
ldaps = "ldaps://auth.${config.networks.internet.domain_dotless}:636";
ldaps = "ldaps://auth.${config.networks.internet.uqdn}:636";
virtualRegex = pkgs.writeText "virtual-regex" ''
/^kat\.[^@.]+@kittywit\.ch$/ kat@kittywit.ch
@ -90,7 +90,7 @@ in {
services.postfix = {
enable = true;
enableSubmission = true;
hostname = config.networks.internet.domain_dotless;
hostname = config.networks.internet.uqdn;
domain = "kittywit.ch";
masterConfig."465" = {

4
services/mail/sogo.nix
View file

@ -46,8 +46,8 @@
SOGoMailingMechanism = "smtp";
SOGoForceExternalLoginWithEmail = YES;
SOGoSMTPAuthenticationType = PLAIN;
SOGoSMTPServer = "smtps://${config.networks.internet.domain_dotless}:465";
SOGoIMAPServer = "imaps://${config.networks.internet.domain_dotless}:993";
SOGoSMTPServer = "smtps://${config.networks.internet.uqdn}:465";
SOGoIMAPServer = "imaps://${config.networks.internet.uqdn}:993";
SOGoUserSources = (
{
type = ldap;