chris/sneeuwvlok
chris/sneeuwvlok
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: chris:9b819a2a58397bee38aa1d25d1fedf093d18dab6
Branches Tags
chris:main
chris:feature/convex
chris:feature/nix-anywhere
..
compare: chris:5668e1048da9153d17336616c8bcc93fe4ad1911
Branches Tags
chris:main
chris:feature/convex
chris:feature/nix-anywhere

5 commits
9b819a2a58 ... 5668e1048d

Author SHA1 Message Date
Chris Kruining
5668e1048d
chore: create temporary extra user in zitadel
Some checks failed
Test action / kaas (push) Failing after 1s
Details
2025-11-03 16:47:09 +01:00
Chris Kruining
8104ba7e93
feat(zitadel): change the default value of the username to the key instead of the email. 
This should ensure that binding to the apps goes more smoothly
 2025-11-03 16:36:19 +01:00
Chris Kruining
7100d1c59c
restart synapse when secrets change 2025-11-03 16:33:08 +01:00
chris
7125d8d375 ops(secrets): set secret "synapse/oidc_secret" for machine "ulmo" 2025-11-03 15:23:12 +00:00
chris
13697bfc51 ops(secrets): set secret "synapse/oidc_id" for machine "ulmo" 2025-11-03 15:22:55 +00:00
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/nixos/services/authentication/zitadel/default.nix
View file

@ -165,10 +165,10 @@ in
userName = mkOption { userName = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = cfg.organization.${org}.user.${username}.email; default = username;
example = "someone@some.domain"; example = "some_user_name";
description = '' description = ''
Username. Default value is the user's email, you can overwrite that by setting this option Username. Default value is the key of the config object you created, you can overwrite that by setting this option
''; '';
}; };

1
modules/nixos/services/communication/matrix/default.nix
View file

@ -187,6 +187,7 @@ in
client_id: '${config.sops.placeholder."synapse/oidc_id"}' client_id: '${config.sops.placeholder."synapse/oidc_id"}'
client_secret: '${config.sops.placeholder."synapse/oidc_secret"}' client_secret: '${config.sops.placeholder."synapse/oidc_secret"}'
''; '';
restartUnits = [ "matrix-synapse.service" ];
}; };
}; };
}; };

7
systems/x86_64-linux/ulmo/default.nix
View file

@ -53,6 +53,12 @@
roles = [ "ORG_OWNER" ]; roles = [ "ORG_OWNER" ];
instanceRoles = [ "IAM_OWNER" ]; instanceRoles = [ "IAM_OWNER" ];
}; };
kaas = {
email = "chris+kaas@kruining.eu";
firstName = "Kaas";
lastName = "Kruining";
};
}; };
project = { project = {
@ -72,6 +78,7 @@
assign = { assign = {
chris = [ "jellyfin" "jellyfin_admin" ]; chris = [ "jellyfin" "jellyfin_admin" ];
kaas = [ "jellyfin" ];
}; };
application = { application = {

8
systems/x86_64-linux/ulmo/secrets.yml
View file

@ -6,8 +6,8 @@ zitadel:
forgejo: forgejo:
action_runner_token: ENC[AES256_GCM,data:yJ6OnRq5kinbuhvH06K5o3l86EafuBoojMwg/qhP+cgeH+BwPeE+Ng==,iv:IeXJahPxgLNIUFmkgp495tLVh8UyQBmJ2SnVEUhlhHs=,tag:XYQi613CxSp8AQeilJMrsg==,type:str] action_runner_token: ENC[AES256_GCM,data:yJ6OnRq5kinbuhvH06K5o3l86EafuBoojMwg/qhP+cgeH+BwPeE+Ng==,iv:IeXJahPxgLNIUFmkgp495tLVh8UyQBmJ2SnVEUhlhHs=,tag:XYQi613CxSp8AQeilJMrsg==,type:str]
synapse: synapse:
oidc_id: ENC[AES256_GCM,data:GPc4XBmIqWKbisN8patC0MNR,iv:wKCZ7PWn1WZOboc9I3JQXaxn4NiqMckCgC4d001F7jk=,tag:CBKcW4luhrJ+BOGH+UBmog==,type:str] oidc_id: ENC[AES256_GCM,data:XbCpyGq0LeRJWq8dv/5Dipvp,iv:YDhgl26z1NBbIQLoLdGVz0+ze6o1ZcmgVHPfwoRj57I=,tag:y2vUuqnDmtTvVQmZCAlnLg==,type:str]
oidc_secret: ENC[AES256_GCM,data:3Z8XwAPBHUG7Z09uTkd0ZH80lRVPF2a8tt0cFvrFA9s5R6G2ULkbHZM5V2VZBZ7FNhv7JINilGdRaibvF3U3Tg==,iv:U5Z3VcuWxwX5kNTvmG7YFiPJSl8Xg2nRDPdz0tekric=,tag:o2s67WjB7mXJlyo8jlcUzw==,type:str] oidc_secret: ENC[AES256_GCM,data:nVFi5EFbNMZ0mvrDHVYC0NiwJlo2eEw44D+Fcv9SKSb2oO00lGEDkP/oXDj5YgDq6RLQSe3f/SUOn77ntwnZYg==,iv:awe7VNUYOn9ofl1QlQTrEN5d0i5WkVM35qndruL4VXo=,tag:8Yoc9lFF9aWbtAa5fzQGEA==,type:str]
sops: sops:
age: age:
- recipient: age19qfpf980tadguqq44zf6xwvjvl428dyrj46ha3n6aeqddwhtnuqqml7etq - recipient: age19qfpf980tadguqq44zf6xwvjvl428dyrj46ha3n6aeqddwhtnuqqml7etq
@ -28,7 +28,7 @@ sops:
TTRWaHhpNWlkVDFmMFN4ZTNHMUxyNVkKV693pzTKRkZboQCMPr9IyMGSgxfuHXcb TTRWaHhpNWlkVDFmMFN4ZTNHMUxyNVkKV693pzTKRkZboQCMPr9IyMGSgxfuHXcb
Y6BNcp6Qg6PWtX5QI7wRkPNINAK1TEbRBba+b8h6gMmVU4DliQyFiQ== Y6BNcp6Qg6PWtX5QI7wRkPNINAK1TEbRBba+b8h6gMmVU4DliQyFiQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-10-30T20:58:01Z" lastmodified: "2025-11-03T15:23:12Z"
mac: ENC[AES256_GCM,data:7vQ5wV58UNUH5bOgyUxaifAbU3GTqZi2gH+rpAR+d/31rx8yeKVNMj0aWA5ianpUvVt2kbaap6Aj+Sxl3M8wI9jtg2o/3FmR+xEHEWgQ/jw1q9zvKIAUV6SeM1Hg639iV3xcC8F8U+Xy50H85f4B3XQWGJMnUamqH9LYrUjv8nY=,iv:vOGvilRSrPZW3uir1nwlxzhg+hXE5yw6r8vCr5Cxmt0=,tag:X9OYdCPuDz3o5kYLUKHmXg==,type:str] mac: ENC[AES256_GCM,data:XJW6H5FTjkGhbXtiGvscfm5W+04OqtUmYPrrzfZ5brNRviYiikwKR4OB2yFFNmRpMxseWOy+3a4Nk+/oTqJ4ycBIlatzoL3GxwfysLi6f5+Qtdjr+EG4MzZRaQobJ9NXjB6pAYGBe5OxDMvHHOuhv5lMI9SFsNzdIHzFRLQv0QQ=,iv:UUZzsyqnJG/eZktkRrnPhC5DYB3MeACh7ldx/k9+ZDk=,tag:42cI9dvQowQzeqkqFvzUGQ==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.11.0 version: 3.11.0