From 738cca62c1c4b5297d636fc331cd49bd82eaa0a6 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 26 Dec 2021 00:46:48 +0300
Subject: [PATCH] feat(monorepo-gerrit): Configure for Keycloak compatibility

Change-Id: Ic3fce02b071c09cf03e652510f16bafb795a5a1d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4614
Autosubmit: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: grfn <grfn@gws.fyi>
---
 ops/modules/monorepo-gerrit.nix |  11 ++++++-----
 ops/secrets/gerrit-secrets.age  | Bin 835 -> 828 bytes
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ops/modules/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix
index 30caa984d..6638f30b3 100644
--- a/ops/modules/monorepo-gerrit.nix
+++ b/ops/modules/monorepo-gerrit.nix
@@ -94,12 +94,13 @@ in {
         html = "<a href=\"https://cl.tvl.fyi/$1\">cl/$1</a>";
       };
 
-      # Configures integration with CAS, which then integrates with a variety
-      # of backends.
+      # Configures integration with Keycloak, which then integrates with a
+      # variety of backends.
       auth.type = "OAUTH";
-      plugin.gerrit-oauth-provider-cas-oauth = {
-        root-url = "https://login.tvl.fyi";
-        client-id = "OAUTH-TVL-gerrit-Fv0d8Aizz5";
+      plugin.gerrit-oauth-provider-keycloak-oauth = {
+        root-url = "https://auth.tvl.fyi";
+        realm = "TVL";
+        client-id = "gerrit";
         # client-secret is set in /var/lib/gerrit/etc/secure.config.
       };
 
diff --git a/ops/secrets/gerrit-secrets.age b/ops/secrets/gerrit-secrets.age
index 077f33f060b3d5fffc495bf93e3b8b24db3271f4..02a3c66b536912a0b9d4af3b431f226fa0ace9e0 100644
GIT binary patch
delta 758
zcmX@iwufzkPJLQ&S#o(|nwdeKYk7KrWsb3bX}D9iS-DS@b9$w>p{KKxtFe(;fM15A
zCs(d{XtI|@pnqX-rGIgRqj!c^fp4B`US@Khe@J1uS5&HBcByx{g=<D>IhU@TLUD11
zZfc5=si~o*f^&hFQ+l96nRd8wm}{0%k!P8Qk6Eafr(2F|rhZkicAB?;QBX)^xr@1P
zV1Y|UrFVHTS3tR^c0jUcS$a-xMVOhsVTDn;QDU~afmc#Ss9%YZS9*qvTS2g|M}ev1
z#E;_PX^F;;sRc<T=Bb92PH6_dMJ`1F-pTo4UKTkimKl{*=HaP%DQUq*g;kMU-Z?2j
z`caYL<zWW?`W{JPkuI+Ju5NDnApwQjuD&iVo}sC!K}8mk`o8&-;~B;4_5DIDa`KBk
zb2E~|L&`EEJ+ytjBFwx!O|k-f%nC9xJ&i+3!*jI*$_?_lqKu1kEZs8$UGkEPJR+T3
zwS5eeEmA8IT^z#`%}a7ULcRRmE6S6D^-Uc?q2%nKn_iTfSe&Y0ouw31t)s0FV3d|$
zk!)wAP#NHB<riq6q)?w@6di7D9mVDA9+4MhS>#mWY8sN3XINa2ZJ_UM;FFV|WMrak
zV3FonVOZts8<yv0nwn&6?o?)Ik{el8&ZVoXtKi}kQec`}m0I9xSs9d}ZRzglmFH`b
zR2J%3;N;_E6jGGr;+5`gUSgD;&2{r$UGKt-cl_t)CGNhG`1*9cppxUabB|UWp1!0f
zP5a09$ml1GkCdL|nlDR>iw%^!nsMy(y6T$_sy)eirz2|uszas!-|B1WQ=fnKyvy%C
zzn;fVO0jO;+&Z@toZdF%x`i!%t#S18lhZqA7mLkHWz~P5QxkLT2M@1cIM?;fPY&m4
z>b@5WsnFefMQ&YQwCLP(#-2@Ef0<_-oO^knTajLfO8$YX%{%6F1ns@?O|L36ZP(sk
wi6@K>o@7`Vw<*#6HrI3;?Nu=W?>~E`EI)ou@<Zln#xK3CCI$De%D?#y0BfWlW&i*H

delta 765
zcmdnPc9?B~PQ6pPWqD$un|rBiT2PdBh)GCdj!Bh^eqpM2L~c@5s)u)>p-XB?h*x5H
zD3_(1ex;*RX@o_TNqU)qkEfTnVTM~lez<FCWKx)md#Z=Ib8=OMN3y%W374*&LUD11
zZfc5=si~o*f^&hFQ+l9+i*H&=X+TPvrHOM%esM`~h?{#^nx$D<a6w^Ow!4M4afD}i
zp{09NWu=h`my1`1r%%3LM6hvQYE+0}zCnO*ZeC`JW1@#wVMMa2g_F5|Rk2TIu8Bwa
z#E;_P{^3bRo>e(P=~ZEoiAJGbA;pP~k;x{;7JgCM$%zqFsfJNmq3-2*E{={|&bdZ8
zDS7^0u3iyYF6NaUVTR_GWoE|7DUQKGx%uhl1!jr*Mh3yz{yveD;~B;4EhD2`Dx8gz
zBD^zld{ZpabBgmz4f8Dx%rZ(M9gRGEDvbOB^L$J^ee+zo%Cy~0N{uZF%+r!BE2Hv#
z%0i4Q^72Cc4GUepi^2-Zf-THa%>8nT3ey5Xp`=!nsGDAtnpm8w;G7#@lBZDXs$ddf
z>lersVBzIoRqU9eZ&~l-U6kgQn-S<Anw{nwR_apW7vgT1=AEH!=I@)D6X_okR$*Z1
zQRHsonr7w{V4$t<>lT^h!d0H0n4j-%8WiD?QR3oXU|tpI$fc{Rt6-j{U1VUMm6x6q
zUJ;q%?Hy|FXl_xFoRXcB73v&OX>J~6=$qkFY?k9^!qpZP^02<>%%oTRSpn65CzZy$
z)Dei8HBU%vS?S8+drb$5-<3|VN?5mRvAo84hq}NYI`d<f%nDKPTK4EQpZwF~Tg|^M
zcqjSxz=5Ld8_LnwHvbU{h)^#&A@w*|pkY_e+DxXbnu^&@^`~CP9WW3`6LNE~dDZyq
zgPi)^qUH8?PXAlVUX>HQD&T2*fl}o?v$irPUoMx4WnXH_uJ77%%(=7b!%XoKG5egZ
ztelx`DYJI|w(GJA<QGxz4-?zTckO#(>&n!fPW>IN>IEAYF?ns%)ZJ*NoSxNq9ss;q
B8M*)f