mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-11 07:10:39 +02:00
chore: make some secrets intermediary
This commit is contained in:
parent
3becfbbf19
commit
4e9a9de858
2 changed files with 6 additions and 10 deletions
|
@ -11,7 +11,7 @@ let
|
||||||
|
|
||||||
mkRandomSecret = {
|
mkRandomSecret = {
|
||||||
generator.script = "alnum";
|
generator.script = "alnum";
|
||||||
mode = "000";
|
intermediary = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
mkArgon2id = secret: {
|
mkArgon2id = secret: {
|
||||||
|
@ -65,13 +65,10 @@ in
|
||||||
inherit (domainCfg) public;
|
inherit (domainCfg) public;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
mailboxes = lib.flip lib.mapAttrs' globals.mail.domains (
|
mailboxes."catch-all@${primaryDomain}" = {
|
||||||
_domain: _domainCfg:
|
password_hash = "%{file:${config.age.secrets.idmail-mailbox-hash_catch-all.path}}%";
|
||||||
lib.nameValuePair "catch-all@${primaryDomain}" {
|
owner = "admin";
|
||||||
password_hash = "%{file:${config.age.secrets.idmail-mailbox-hash_catch-all.path}}%";
|
};
|
||||||
owner = "admin";
|
|
||||||
}
|
|
||||||
);
|
|
||||||
# XXX: create mailboxes for git@ vaultwarden@ and simultaneously alias them to the catch all for a send only mail.
|
# XXX: create mailboxes for git@ vaultwarden@ and simultaneously alias them to the catch all for a send only mail.
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,7 +23,7 @@ in
|
||||||
|
|
||||||
age.secrets.stalwart-admin-pw = {
|
age.secrets.stalwart-admin-pw = {
|
||||||
generator.script = "alnum";
|
generator.script = "alnum";
|
||||||
mode = "000";
|
intermediary = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
age.secrets.stalwart-admin-hash = {
|
age.secrets.stalwart-admin-hash = {
|
||||||
|
@ -585,7 +585,6 @@ in
|
||||||
"${cfg.package}/bin/stalwart-mail --config=/run/stalwart-mail/config.toml"
|
"${cfg.package}/bin/stalwart-mail --config=/run/stalwart-mail/config.toml"
|
||||||
];
|
];
|
||||||
RestartSec = "60"; # Retry every minute
|
RestartSec = "60"; # Retry every minute
|
||||||
CacheDirectory = lib.trace "remove stalwart cache soon, it's upstream" "stalwart-mail";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue