mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

chore: typos

Browse source
This commit is contained in:
oddlama 2023-08-27 16:22:26 +02:00
parent 9891a0743d
commit 8ad13ec0bf
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hosts/ward/microvms/kanidm.nix
View file

@ -98,7 +98,7 @@ in {
groups."grafana.server-admins" = {}; groups."grafana.server-admins" = {};
systems.oauth2.grafana = { systems.oauth2.grafana = {
displayName = "Grafana"; displayName = "Grafana";
originUrl = "https://${config.networking.providedDomains.grafana}"; originUrl = "https://${sentinelCfg.networking.providedDomains.grafana}";
basicSecretFile = config.age.secrets.kanidm-oauth2-grafana.path; basicSecretFile = config.age.secrets.kanidm-oauth2-grafana.path;
scopeMaps.grafana = ["openid" "email" "profile"]; scopeMaps.grafana = ["openid" "email" "profile"];
supplementaryScopeMaps = { supplementaryScopeMaps = {
@ -113,7 +113,7 @@ in {
groups."forgejo.admins" = {}; groups."forgejo.admins" = {};
systems.oauth2.forgejo = { systems.oauth2.forgejo = {
displayName = "Forgejo"; displayName = "Forgejo";
originUrl = "https://${config.networking.providedDomains.forgejo}"; originUrl = "https://${sentinelCfg.networking.providedDomains.forgejo}";
basicSecretFile = config.age.secrets.kanidm-oauth2-forgejo.path; basicSecretFile = config.age.secrets.kanidm-oauth2-forgejo.path;
scopeMaps.forgejo = ["openid" "email" "profile"]; scopeMaps.forgejo = ["openid" "email" "profile"];
supplementaryScopeMaps = { supplementaryScopeMaps = {
@ -126,6 +126,7 @@ in {
# Web Sentinel # Web Sentinel
groups.web-sentinel = {}; groups.web-sentinel = {};
groups."web-sentinel.adguardhome" = {}; groups."web-sentinel.adguardhome" = {};
groups."web-sentinel.influxdb" = {};
systems.oauth2.web-sentinel = { systems.oauth2.web-sentinel = {
displayName = "Web Sentinel"; displayName = "Web Sentinel";
originUrl = "https://oauth2.${personalDomain}"; originUrl = "https://oauth2.${personalDomain}";

6
modules/meta/kanidm.nix
View file

@ -619,7 +619,7 @@ in {
unknownGroups = subtractLists (attrNames cfg.provision.groups) personCfg.groups; unknownGroups = subtractLists (attrNames cfg.provision.groups) personCfg.groups;
in { in {
assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == []; assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == [];
message = "kanidm: provision.persons.${person}.groups: Refers to unknown groups: ${unknownGroups}"; message = "kanidm: provision.persons.${person}.groups: Refers to unknown groups: ${toString unknownGroups}";
}) })
++ concatLists (flip mapAttrsToList cfg.provision.systems.oauth2 (oauth2: oauth2Cfg: [ ++ concatLists (flip mapAttrsToList cfg.provision.systems.oauth2 (oauth2: oauth2Cfg: [
{ {
@ -630,13 +630,13 @@ in {
unknownGroups = subtractLists (attrNames cfg.provision.groups) (attrNames oauth2Cfg.scopeMaps); unknownGroups = subtractLists (attrNames cfg.provision.groups) (attrNames oauth2Cfg.scopeMaps);
in { in {
assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == []; assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == [];
message = "kanidm: provision.systems.oauth2.${oauth2}.scopeMaps: Refers to unknown groups: ${unknownGroups}"; message = "kanidm: provision.systems.oauth2.${oauth2}.scopeMaps: Refers to unknown groups: ${toString unknownGroups}";
}) })
(let (let
unknownGroups = subtractLists (attrNames cfg.provision.groups) (attrNames oauth2Cfg.supplementaryScopeMaps); unknownGroups = subtractLists (attrNames cfg.provision.groups) (attrNames oauth2Cfg.supplementaryScopeMaps);
in { in {
assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == []; assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == [];
message = "kanidm: provision.systems.oauth2.${oauth2}.supplementaryScopeMaps: Refers to unknown groups: ${unknownGroups}"; message = "kanidm: provision.systems.oauth2.${oauth2}.supplementaryScopeMaps: Refers to unknown groups: ${toString unknownGroups}";
}) })
])); ]));

BIN
secrets/global.nix.age
View file

Binary file not shown.