From bfc0d81cf165cd60690837dc9a20b13f3d7bd93e Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Sun, 27 Aug 2023 22:31:08 +0100
Subject: [PATCH] feat: ldap backend updated to accomodate multiple env files

---
 applications/ldap/ldap_backend.nix |   6 +++++-
 flake.lock                         |   6 +++---
 secrets/discord/ldap.age           | Bin 0 -> 1183 bytes
 secrets/secrets.nix                |   6 ++++++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 secrets/discord/ldap.age

diff --git a/applications/ldap/ldap_backend.nix b/applications/ldap/ldap_backend.nix
index 7df3eb0..1060afa 100644
--- a/applications/ldap/ldap_backend.nix
+++ b/applications/ldap/ldap_backend.nix
@@ -48,6 +48,7 @@
     #backups = [ "/etc/silver_ul_ical/database.db" ];
 
     age.secrets.ldap_self_service.file = ../../secrets/ldap/self_service.age;
+    age.secrets.ldap_discord.file = ../../secrets/discord/ldap.age;
 
     skynet_acme.domains = [
       "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
@@ -71,7 +72,10 @@
       enable = true;
 
       # contains teh password in env form
-      envFile = config.age.secrets.ldap_self_service.path;
+      env = {
+        ldap = config.age.secrets.ldap_self_service.path;
+        discord = config.age.secrets.ldap_discord.path;
+      };
 
       ldap  = {
         host = "ldaps://account.skynet.ie";
diff --git a/flake.lock b/flake.lock
index 8139a87..ae3e940 100644
--- a/flake.lock
+++ b/flake.lock
@@ -395,11 +395,11 @@
       },
       "locked": {
         "host": "gitlab.skynet.ie",
-        "lastModified": 1693164823,
-        "narHash": "sha256-1VRjCuUmMVFAsWQzkJ4kzWzaCqDSNQ6f6M2h6eVwRwE=",
+        "lastModified": 1693168330,
+        "narHash": "sha256-GohtWXpbsu3usQOSbrXajvsQsrpwpvhdNVMqyi2ioSg=",
         "owner": "compsoc1%2Fskynet%2Fldap",
         "repo": "backend",
-        "rev": "92fad0dc4bd936802d3324bcb43790530b6212db",
+        "rev": "01b5be26606d048210c1a5c2d0a1c127d8cdf2e7",
         "type": "gitlab"
       },
       "original": {
diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age
new file mode 100644
index 0000000000000000000000000000000000000000..df1fa6e51c1e3d7c717953ed25fd53e3bfe39957
GIT binary patch
literal 1183
zcmZ9|&#T)60KjoUCz1&pZsKK!dU7+bFHO@V4Lm1p+NMdGG)<Ex?Hnvg^YWuV^82UY
zJm^I|yn&z&WI9mT5C$H6OxejH>>xTHxamQ3dJ^YV4`Zm{ssF(D17FQDtLEAW3qN+e
z^|lvUPznRp)0HT)tLD6pqA*dJz<$QJDvPzY%tSU(aE;YSLolU?78!BKmo{#?wiVLS
zpv%%ZS!4i9t1$)>g2>064jav60V_*q;knbEvCOD-jRK<v+G)weXj2R6Y?)>i${>ej
z9{3cuSbDPsL(DrfeApyJc$ueBXt)GYrn(ugx(lF3D4{w-)s;9(HCZxhYB(NE>+KxT
z*tj(M5lG^xXd*lqZE8W&WGt)FbLz}2wSu0N_QSZ%DD6BUaVF@g4PlO~>-9<d-*99v
zN(<oJ!Blk}$Qln^T-)u$PNH$SuVYXbG3OvU$H$(HMX-W;n;KoVxS&;$XjOsNvBY|l
z#x$SwyJ!RS>uO<ZXjc<0amFkH-H6$s-v!3*s`ToC(pVafi>wP8-0dRNT4GfW_fu!y
z<O|GbM)ruQZEDG^Y$H}BD(B=tm@*LIGbHOLs+D818Yq-Np-tXeO=)CB+TmPPI3O<-
zs=jJ5AxsJgVS=3@MnlZV(F&WINc=dki>ZN3y0pe^YJI)t_@l}iMOCm-K&k_VN!O5i
zHtpizq=l)rFIdHNAhVsJ<smF=0f~@=zS6N}6%BYE)Dv<V5Ag254jF-WgpgmOO*8Qe
zF==jU|DS{tk|PPth&i7^m+&~X#EAiVhP5R7;-X09>4F{TvK93+VC3+qI;M;~YiD(<
zF9bQquB0SfvT@&MngIn9d`2yF6gB?S&WumPRVy^L$gG?rw>a0Sz?I}|HpBpu5@lRP
zOAE;uY)Oy0g}2KLK+eu`E*o*qi0^h<<7wGgI<A8-yP!wcz|fWT0%vPbj{r(Wf}obb
zDSFG;l~~)%piwyK4LwrOcV`21$k6^|pyLy7j`cDrwBgiq=7bJSxuFQL4A2>^WT0BD
zRy?y77yVM88mXWOMP4svh&NoikUd^ym?H6Qu<7Ws3AUTS&e!qPQ-|Z`_L1iv5*K!^
z!Osgh^g3~)bLo{A<7eCNo;&#V#M__Af85dEJcdiPgG=}KwzDt({_Dz73ORphZ|}il
zk3WoGc;>qE#9Oc3+yCLI&x7CFcR!xLarqX0;t==h1AKM-y!iCx`@fw0>dVHlPkzMM
z;ZHX&9{Ka&9(Qy9@b}<vSE5Jnp1M)H^Ygy({??OQXO6q&$p<f8?A?Cn>PIg>vUBUb
V3rF$jLzMjB+NWo~`R-T$_CNkkm=yp3

literal 0
HcmV?d00001

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index ab5f696..b85b4f1 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -86,6 +86,10 @@ let
   restic = [
     neuromancer
   ];
+
+  discord = [
+    kitt
+  ];
 in
 {
   # nix run github:ryantm/agenix -- -e secret1.age
@@ -115,4 +119,6 @@ in
   "backup/restic.age".publicKeys = users ++ systems;
   "backup/restic_pw.age".publicKeys = users ++ restic;
 
+  # discord bot and discord
+  "discord/ldap.age".publicKeys = users ++ ldap ++ discord;
 }
\ No newline at end of file