fricloud/server-configs
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

bumped sources + fixed stalwart - added todo

Browse source
This commit is contained in:
eyjhb 2025-06-29 20:40:34 +02:00
parent 038865ba84
commit 801dcdbfd0
Signed by: eyjhb
GPG key ID: 609F508E3239F920
3 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
machines/gerd/services/stalwart/stalwart.nix
View file

@ -44,9 +44,17 @@ in {
dn = config.mine.shared.settings.ldap.bind_dn;
secret = "%{file:${config.age.secrets.lldap-bind-user-pass.path}}%";
# TODO: I'm not sure if this should be lookup, or template
# LLDAPs config is out of date, and there is a closed issue here
# https://github.com/stalwartlabs/stalwart/issues/1730
# this was changed in v.0.12.4, changelog here
# https://github.com/stalwartlabs/stalwart/releases/tag/v0.12.4
auth = {
enable = true;
# method = "template";
# dn = "cn={username},${config.mine.shared.settings.ldap.search_base}";
method = "lookup";
dn = "cn=?,${config.mine.shared.settings.ldap.search_base}";
search = true;
};
};

16
shared/sources/default.nix
View file

@ -8,22 +8,6 @@ in sources // {
src = sources.nixpkgs;
name = "nixpkgs-patched";
patches = [
# stalwart-mail: 0.11.8 -> 0.12.0
(pkgs.fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/409178.patch";
sha256 = "sha256-06J8pTjqeWTL6MJqVq17r3eelL5p/AfvUsPye5icVUg=";
})
# nixos/stalwart-mail: fix incorrect config for webadmin and spam-filter
(pkgs.fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/412054.patch";
sha256 = "sha256-OExslGsrGGPWSJJFPkZgYV8DaPKq9YDlmozPf/bV6dE=";
})
# headscale: 0.25.1 -> 0.26.0, update nixos module and test accordingly #407644
(pkgs.fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/407644.patch";
sha256 = "sha256-0fAB9DJ8KeocS/ZP4CPEt9VHkAu6gt025rSu3Skssqo=";
})
# # Revert "nixos/murmur: Get rid of global lib expansion" #413495
# (pkgs.fetchpatch {
# url = "https://github.com/NixOS/nixpkgs/pull/413495.patch";

24
shared/sources/sources.json
View file

@ -5,10 +5,10 @@
"homepage": "https://matrix.to/#/#agenix:nixos.org",
"owner": "ryantm",
"repo": "agenix",
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"sha256": "0ngkhf7qamibhbl9z1dryzscd36y4fz1m1h6fb2z6fylw0b8029p",
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
"sha256": "103slb8xy5sb68zxjjbb9d0svq8xz751a7yrg6vrz5rh4374bzgl",
"type": "tarball",
"url": "https://github.com/ryantm/agenix/archive/4835b1dc898959d8547a871ef484930675cb47f1.tar.gz",
"url": "https://github.com/ryantm/agenix/archive/531beac616433bac6f9e2a19feb8e99a22a66baf.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"disko": {
@ -17,10 +17,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "disko",
"rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4",
"sha256": "0h4br7anx158shym8a812wi43qhq5qqsv3xk7vxm6s6dawnp4azw",
"rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
"sha256": "0awlc32h3pdk3sx272ifpccjzv7nq6mkimxgkazdbzgr85zpw3rn",
"type": "tarball",
"url": "https://github.com/nix-community/disko/archive/58d6e5a83fff9982d57e0a0a994d4e5c0af441e4.tar.gz",
"url": "https://github.com/nix-community/disko/archive/83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"drasl": {
@ -36,10 +36,10 @@
"homepage": null,
"owner": "RasmusRendal",
"repo": "drtvrss",
"rev": "2059220fb3342202091179f5496575ed596eab9e",
"sha256": "017m02xhm8j2i85jq30dm2z3vnxv74f06b7mqi8wz32j95x5qdal",
"rev": "dc0900835a5ed723c6e53d2c408ba7d51ef27bb9",
"sha256": "0k450i7fl4l0avmdz2dzdrmharypajq3qmyj4xsc6xvgi23nfrb0",
"type": "tarball",
"url": "https://github.com/RasmusRendal/drtvrss/archive/2059220fb3342202091179f5496575ed596eab9e.tar.gz",
"url": "https://github.com/RasmusRendal/drtvrss/archive/dc0900835a5ed723c6e53d2c408ba7d51ef27bb9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"flake-compat": {
@ -72,10 +72,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
"sha256": "064q32jmj54iwgh4lcdg2aii75cr5lvb683ym5pmj2kkj340pnpd",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"sha256": "1hw4ccgwzi120j41xr8k8njsxk74l0ciir1g93mij1p43cmrgccj",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/96ec055edbe5ee227f28cdbc3f1ddf1df5965102.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/30e2e2857ba47844aa71991daa6ed1fc678bcbb7.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}