chore: update flake

This commit is contained in:
oddlama 2024-09-07 01:39:12 +02:00
parent 2fece6e5cc
commit 3906586a95
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
13 changed files with 162 additions and 1242 deletions

View file

@ -1,27 +0,0 @@
diff --git a/crates/jmap/src/api/management/domain.rs b/crates/jmap/src/api/management/domain.rs
index e3890df5..7083aaf6 100644
--- a/crates/jmap/src/api/management/domain.rs
+++ b/crates/jmap/src/api/management/domain.rs
@@ -123,6 +123,8 @@ impl JMAP {
}
async fn build_dns_records(&self, domain_name: &str) -> trc::Result<Vec<DnsRecord>> {
+ let signature_config = self.core.storage.config.build_config("signature").await?;
+
// Obtain server name
let server_name = self
.core
@@ -143,7 +145,11 @@ impl JMAP {
}
_ => (),
}
- keys.insert(key, value);
+ let val = signature_config.keys
+ .get(&format!("signature.{key}"))
+ .cloned()
+ .unwrap_or(value.clone());
+ keys.insert(key, val);
}
// Add MX and CNAME records

View file

@ -1,4 +1,5 @@
{
inputs,
config,
globals,
lib,
@ -43,6 +44,7 @@ in {
};
services.idmail = {
package = inputs.idmail.packages."x86_64-linux".default;
enable = true;
# Stalwart will change permissions due to SQLite implementation.
# Therefore, run as stalwart-mail since we don't allow reading

View file

@ -51,14 +51,6 @@ in {
services.stalwart-mail = {
enable = true;
package = pkgs.stalwart-mail.overrideAttrs (old: {
patches =
old.patches
++ [
./a.patch
];
doCheck = false;
});
settings = let
case = field: check: value: data: {
"if" = field;

View file

@ -1,6 +1,7 @@
{
config,
globals,
pkgs,
...
}: let
kanidmDomain = "auth.${globals.domains.me}";
@ -85,6 +86,7 @@ in {
];
services.kanidm = {
package = pkgs.kanidm.withSecretProvisioning;
enableServer = true;
serverSettings = {
domain = kanidmDomain;
@ -114,6 +116,7 @@ in {
systems.oauth2.immich = {
displayName = "Immich";
originUrl = "https://${globals.services.immich.domain}/";
originLanding = "https://${globals.services.immich.domain}/";
basicSecretFile = config.age.secrets.kanidm-oauth2-immich.path;
preferShortUsername = true;
# XXX: PKCE is currently not supported by immich
@ -129,6 +132,7 @@ in {
public = true;
displayName = "Netbird";
originUrl = "https://${globals.services.netbird.domain}/";
originLanding = "https://${globals.services.netbird.domain}/";
preferShortUsername = true;
enableLocalhostRedirects = true;
enableLegacyCrypto = true;
@ -140,6 +144,7 @@ in {
systems.oauth2.paperless = {
displayName = "Paperless";
originUrl = "https://${globals.services.paperless.domain}/";
originLanding = "https://${globals.services.paperless.domain}/";
basicSecretFile = config.age.secrets.kanidm-oauth2-paperless.path;
preferShortUsername = true;
scopeMaps."paperless.access" = ["openid" "email" "profile"];
@ -153,6 +158,7 @@ in {
systems.oauth2.grafana = {
displayName = "Grafana";
originUrl = "https://${globals.services.grafana.domain}/";
originLanding = "https://${globals.services.grafana.domain}/";
basicSecretFile = config.age.secrets.kanidm-oauth2-grafana.path;
preferShortUsername = true;
scopeMaps."grafana.access" = ["openid" "email" "profile"];
@ -172,6 +178,7 @@ in {
systems.oauth2.forgejo = {
displayName = "Forgejo";
originUrl = "https://${globals.services.forgejo.domain}/";
originLanding = "https://${globals.services.forgejo.domain}/";
basicSecretFile = config.age.secrets.kanidm-oauth2-forgejo.path;
scopeMaps."forgejo.access" = ["openid" "email" "profile"];
# XXX: PKCE is currently not supported by gitea/forgejo,
@ -191,6 +198,7 @@ in {
systems.oauth2.web-sentinel = {
displayName = "Web Sentinel";
originUrl = "https://oauth2.${globals.domains.me}/";
originLanding = "https://oauth2.${globals.domains.me}/";
basicSecretFile = config.age.secrets.kanidm-oauth2-web-sentinel.path;
preferShortUsername = true;
scopeMaps."web-sentinel.access" = ["openid" "email"];