From 8ad13ec0bff71e9bba321d2cef70cabca493a0ea Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 27 Aug 2023 16:22:26 +0200 Subject: [PATCH] chore: typos --- hosts/ward/microvms/kanidm.nix | 5 +++-- modules/meta/kanidm.nix | 6 +++--- secrets/global.nix.age | Bin 1321 -> 1318 bytes 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hosts/ward/microvms/kanidm.nix b/hosts/ward/microvms/kanidm.nix index c114882..45e5d93 100644 --- a/hosts/ward/microvms/kanidm.nix +++ b/hosts/ward/microvms/kanidm.nix @@ -98,7 +98,7 @@ in { groups."grafana.server-admins" = {}; systems.oauth2.grafana = { displayName = "Grafana"; - originUrl = "https://${config.networking.providedDomains.grafana}"; + originUrl = "https://${sentinelCfg.networking.providedDomains.grafana}"; basicSecretFile = config.age.secrets.kanidm-oauth2-grafana.path; scopeMaps.grafana = ["openid" "email" "profile"]; supplementaryScopeMaps = { @@ -113,7 +113,7 @@ in { groups."forgejo.admins" = {}; systems.oauth2.forgejo = { displayName = "Forgejo"; - originUrl = "https://${config.networking.providedDomains.forgejo}"; + originUrl = "https://${sentinelCfg.networking.providedDomains.forgejo}"; basicSecretFile = config.age.secrets.kanidm-oauth2-forgejo.path; scopeMaps.forgejo = ["openid" "email" "profile"]; supplementaryScopeMaps = { @@ -126,6 +126,7 @@ in { # Web Sentinel groups.web-sentinel = {}; groups."web-sentinel.adguardhome" = {}; + groups."web-sentinel.influxdb" = {}; systems.oauth2.web-sentinel = { displayName = "Web Sentinel"; originUrl = "https://oauth2.${personalDomain}"; diff --git a/modules/meta/kanidm.nix b/modules/meta/kanidm.nix index 78f0d6f..8037aef 100644 --- a/modules/meta/kanidm.nix +++ b/modules/meta/kanidm.nix @@ -619,7 +619,7 @@ in { unknownGroups = subtractLists (attrNames cfg.provision.groups) personCfg.groups; in { 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: [ { @@ -630,13 +630,13 @@ in { unknownGroups = subtractLists (attrNames cfg.provision.groups) (attrNames oauth2Cfg.scopeMaps); in { 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 unknownGroups = subtractLists (attrNames cfg.provision.groups) (attrNames oauth2Cfg.supplementaryScopeMaps); in { 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}"; }) ])); diff --git a/secrets/global.nix.age b/secrets/global.nix.age index 1ffc656718ffb621bce7088802c9b16fe1e0602b..309acb09e5f37d84a971628a9612274fd71e96e1 100644 GIT binary patch delta 1303 zcmV+y1?c*z3Z@E>Ab)FVMn-lvR!DVHdQ5IrSz=CNWI04QZE|*PR%1CYXLwdcZCXKb zL1sx-Zwg07Ibml=QA1KUXe)9-b7)R8Nm*@pFh+Q3bZmGxY%6zSI8tzRVrq40O$seO zAaH4REpRe5HXwL$Q)M_&AVG0*IcrO7aY}ARc5-l1IB7*wbAMwodR9hQPiR#!Qd&$; zayUsvQ&Lb!VPpz&b8bX5Wm8gfF+neBRzgxlVn;|ZMq*GjV^nK+OfOAyYH@LFWluL( zb6E;4J|ItdO-4RaetRuva%Ew2Wgtd6K~f4aO)E1c`YiMpmN_I|EXA015O8c%L#B`lh z;pkitbZm`yO(QEU+mho5#eDYh@?)SgxF@H2J27dMbbq7nA3<(=y*xpkI0mNHOmtMc zv)%}Ve?BLcu~S6{T_r#U@W3Y|KR=`3!@PD8zKTy>au5DdtQPS~Fix^F$B@&mak+b{ zdxoJxCCmk4p%b9(`azDCLAK)eYC_kGdnBb2>1o8WDi`dtcYLAv{=^lBhek>o6s2Zu z?u{AVfqy@Ohf3~99R`$l&=1iPrE#(>sOoUlmKmXO2DoWLZ99f(VU5Nh&Ey(^`AHO{ zEKHK40i12L3sH)$&E)NTRAPf1>a!C{v8e;*#E7&fTy5|Fp`BlL!-)M*<01+pt~{~nBFJ`R*5K=CJN^&qVey`qNX>Fc2Kw#@W# z-%&ng(u}9q*Fg+x#z`E<`YjV-!q4X_dVk^5td9rgRz*s+n^UW|GW*y%sAgGELbGzj z=<#J`ye)9MpkULEP)R8pxgVrKat7I3o`1A53$yh57_YzAuIEk4J;!Df!@s~(Zgz}j2WbeY`Ut+HP;|;qb_*t6$)*6RS zI!o#RK7O+Kb46F6E;~j>!OOrBpNL)|j+L1}nGulZMqZCpX)TGF?XAARwt! z%!6nnfy-^AAx?DaBb=?v>1>Z(JB=%tvH0Rf@vG$!^LHKvLE}Mq_$y_6d=Q_^IOQI4 NuE2$*{QML7BroYoQLF#} delta 1306 zcmV+#1?Bpt3aJW^Ab(UbLQqdvLo!!)YIZMXT4^+TK}|ztK}1S%R4YP5WHNC#acyrz zYE(2qX9{mOV?%8*H*{ufZ$@imba_@oF;z7+F?3>bcW6gQN@g*6Ie2+DX-Z5>FbXX` zAaH4REpRe5HXwL$Q)M_&AVFeYVQP0pK}<(Ycy)6}V@-NXHA#6gP-S9taz$!qPG@;pL3vDKb}&gy zOIZpnJ|IDRQgk*WEoX9NVRK~)Idp4wYEe^aaXB+mO)*hPXE$VQLUBb$Mp!p=ZD>e$ za(7sCIdnrtWq)EyaxiHzVl!koWkYgoS9W%KFGMzRXbLtsQg&o*b~jN>R7XxpYea5U zLs?^KMN>v{Y)Vx_aCA>)G-V1cEiE85HB53jctvPUWJ^<3M>9}DIcsN8LS;i(S87#O zS8;W9c4BomD=}_MVK54EFiITLoj}U#H>E*4C~5@Vk$(yTIW}lvDb*8JL^D8@nBHA%{tF{w;C+0Mm#H%cez+Qk9{^iOFtTFm>2UbRu)-ucad{OGlaaP* zMpp-tiSCRn{n4lQQ03Yu(G^sULx+vB_JQ1L3}HD9^#~OgDdEOpc=Ws?4O%fD;K&8D zC9|HK9DiEv!B~9*2inV}eMMiAEQ+K2fwZD@qlDN?d78(^CnBie8Js(nWhWi@e%s#o zxoNL(RN%euDcUOq?Q(m^GY5Kk$TqfkYxRVGZJSrWR+58J&7|- zluh?Qb8^I06e{S4b3#@Q#R>H*-+2d95m$iby??u9`&^CnCR-HMk@04|#E*-^ko)lx zOiFWa2D|*hkELH*P;O+e<7|w$As4XtM#@CzjAfwb7PwAEw9uRFQAt$%qfJp*MXq#8 zcP5FB#6R{a*O~ftb$69~Fc%en>E(G1sCD<{AWUG%3Zys%X15=(n#((qJP~ZBo%@y0 zy?-$lrlmNzCw_iRv%!Nzs`1Ad{pnWI5P&w`9SqgnHPCT>+SGdqa$Fu z+=Uyum1=r?dUVRb`s;UHN*c)1cY)4@iT$@69@+~da4r{T4%2;J#yR-a2K4*g9E z4wuZHbXP&hc+yqZ08b^Wf?pLty5&(p27j>~f>;+gn!P8n!mS?Xyd%i859*(2@}KcW zgzT(*oWypcGcNkor&CyANR0tJb-w-Rp6liwrWu@vaz#_nE+qZ@$ZUyl%_s_UeC!7t z2oKTFwYoDg(*}vdMa?W59{ht$8l*l>*mmf-MT&q!_Yv|F5#l- z5Qb68s^z{