SelfPrivacy/selfprivacy-nixos-config
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git synced 2024-11-26 21:01:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into rolling-testing

Browse source
This commit is contained in:
Inex Code 2021-12-16 14:31:27 +03:00
parent ab74b26a87 3f42ad5c68
commit e5ba447380
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mailserver/system/mailserver.nix
View file

@ -13,11 +13,6 @@ in
}) })
]; ];
services.dovecot2 = {
enablePAM = lib.mkForce true;
showPAMFailure = lib.mkForce true;
};
users.users = { users.users = {
virtualMail = { virtualMail = {
isNormalUser = false; isNormalUser = false;
@ -34,7 +29,6 @@ in
loginAccounts = { loginAccounts = {
"${cfg.username}@${cfg.domain}" = { "${cfg.username}@${cfg.domain}" = {
hashedPassword = cfg.hashedMasterPassword; hashedPassword = cfg.hashedMasterPassword;
catchAll = [ cfg.domain ];
sieveScript = '' sieveScript = ''
require ["fileinto", "mailbox"]; require ["fileinto", "mailbox"];
if header :contains "Chat-Version" "1.0" if header :contains "Chat-Version" "1.0"
@ -49,7 +43,6 @@ in
name = "${user.username}@${cfg.domain}"; name = "${user.username}@${cfg.domain}";
value = { value = {
hashedPassword = user.hashedPassword; hashedPassword = user.hashedPassword;
catchAll = [ cfg.domain ];
sieveScript = '' sieveScript = ''
require ["fileinto", "mailbox"]; require ["fileinto", "mailbox"];
if header :contains "Chat-Version" "1.0" if header :contains "Chat-Version" "1.0"

2
users.nix
View file

@ -17,7 +17,7 @@ in
value = { value = {
isNormalUser = true; isNormalUser = true;
hashedPassword = user.hashedPassword; hashedPassword = user.hashedPassword;
openssh.authorizedKeys.keys = user.sshKeys; openssh.authorizedKeys.keys = (if user ? sshKeys then user.sshKeys else []);
}; };
}) })
cfg.users); cfg.users);