migration setup

This commit is contained in:
Henry Hiles 2026-11-14 17:31:46 -05:00
commit 2519d8a624
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 57 additions and 14 deletions

View file

@ -32,9 +32,10 @@ let
subjectAltName = DNS:localhost,IP:${ip} subjectAltName = DNS:localhost,IP:${ip}
''; '';
# Written by kanidm-bootstrap, read by kanidm-mail-sender # Written by kanidm-bootstrap, read by kanidm-mail-sender and matrixoidc
bootstrapDir = "/var/lib/kanidm-bootstrap"; bootstrapDir = "/var/lib/kanidm-bootstrap";
mailSenderToken = "${bootstrapDir}/mail-sender-token"; mailSenderToken = "${bootstrapDir}/mail-sender-token";
migrateToken = "${bootstrapDir}/migrate-token";
mailSenderConfig = (pkgs.formats.toml { }).generate "kanidm-mail-sender.toml" { mailSenderConfig = (pkgs.formats.toml { }).generate "kanidm-mail-sender.toml" {
instance_display_name = "Federated Nexus"; instance_display_name = "Federated Nexus";
@ -115,6 +116,24 @@ in
]; ];
}; };
"01-migrate" = {
id = "f134ef35-07d4-4eba-8b3b-fffaca231ac6";
assertions = [
{
# Used by matrixoidc's /migrate to create people and send them credential reset links
state = "present";
id = "2f1297c6-0f64-4f03-805c-eef194394d85";
class = [
"account"
"service_account"
];
name = "migrate";
displayname = "Legacy account migration";
entry_managed_by = "idm_admins";
}
];
};
# Existing built-in entries: class is omitted, as asserting it would # Existing built-in entries: class is omitted, as asserting it would
# replace the entry's classes # replace the entry's classes
"10-builtin" = { "10-builtin" = {
@ -137,6 +156,15 @@ in
}; };
}; };
# Its /migrate creates Kanidm accounts for legacy Matrix users
matrixoidc = {
kanidmTokenFile = migrateToken;
args = [
"--kanidmUrl"
"https://${domain}"
];
};
caddy.virtualHosts.${domain}.extraConfig = '' caddy.virtualHosts.${domain}.extraConfig = ''
reverse_proxy https://${address} { reverse_proxy https://${address} {
transport http { transport http {
@ -148,6 +176,12 @@ in
}; };
systemd.services = { systemd.services = {
# Its token is created by kanidm-bootstrap
matrixoidc = {
wants = [ "kanidm-bootstrap.service" ];
after = [ "kanidm-bootstrap.service" ];
};
kanidm-tls = { kanidm-tls = {
description = "Generate Kanidm's loopback TLS certificate"; description = "Generate Kanidm's loopback TLS certificate";
requiredBy = [ "kanidm.service" ]; requiredBy = [ "kanidm.service" ];
@ -228,16 +262,24 @@ in
kanidm system domain set-allow-account-recovery true -D admin kanidm system domain set-allow-account-recovery true -D admin
login idm_admin login idm_admin
# Asserting this membership in a migration didn't persist, so it's # Asserting these memberships in a migration didn't persist, so they're
# re-applied here on every start. Adding an existing member is a no-op. # re-applied here on every start. Adding an existing member is a no-op.
kanidm group add-members idm_message_senders mail-sender -D idm_admin >/dev/null kanidm group add-members idm_message_senders mail-sender -D idm_admin >/dev/null
kanidm group add-members idm_people_admins migrate -D idm_admin >/dev/null
if [ ! -s ${mailSenderToken} ]; then # Generates an API token for a service account, unless one exists
umask 077 token() {
kanidm service-account api-token generate mail-sender mail-sender --readwrite \ [ -s "$2" ] && return
-D idm_admin -o json | jq -er .result > ${mailSenderToken}.tmp (
mv ${mailSenderToken}.tmp ${mailSenderToken} umask 077
fi kanidm service-account api-token generate "$1" "$1" --readwrite \
-D idm_admin -o json | jq -er .result > "$2.tmp"
)
mv "$2.tmp" "$2"
}
token mail-sender ${mailSenderToken}
token migrate ${migrateToken}
''; '';
}; };

11
flake.lock generated
View file

@ -907,15 +907,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1794676437, "lastModified": 1794694767,
"narHash": "sha256-HRitJKsHnkO+lA8ZbkgNQ/RzSAQWx90Nqa4Pvng6p14=", "narHash": "sha256-OkyR28RS3gjy5eMME332vZa1atniqi1YGiLQBHVcZ5g=",
"ref": "refs/heads/main", "ref": "kanidm",
"rev": "9c5b73624fb5c3b853f4604b5b4ff8992005bd49", "rev": "be6b7bdf99b78bb4b1ce998dfe99e1444c254b18",
"revCount": 51, "revCount": 52,
"type": "git", "type": "git",
"url": "https://git.federated.nexus/Henry-Hiles/matrixoidc" "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
}, },
"original": { "original": {
"ref": "kanidm",
"type": "git", "type": "git",
"url": "https://git.federated.nexus/Henry-Hiles/matrixoidc" "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
} }

View file

@ -41,7 +41,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
matrixoidc = { matrixoidc = {
url = "git+https://git.federated.nexus/Henry-Hiles/matrixoidc"; url = "git+https://git.federated.nexus/Henry-Hiles/matrixoidc?ref=kanidm";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nexus = { nexus = {