From e03d3c625537b43cc5bd34737147c14967e10d9e Mon Sep 17 00:00:00 2001
From: Tine <tine@tjo.space>
Date: Fri, 7 Mar 2025 12:48:15 +0100
Subject: [PATCH] feat(id.tjo.space): changes
---
id.tjo.space/configure.sh | 7 -------
.../containers/authentik-ldap.container | 15 ---------------
.../containers/authentik-server.container | 1 +
.../containers/authentik-worker.container | 1 +
id.tjo.space/containers/caddy.container | 1 +
id.tjo.space/containers/postgresql.container | 1 +
id.tjo.space/containers/valkey.container | 1 +
id.tjo.space/secrets.env.encrypted | Bin 642 -> 542 bytes
8 files changed, 5 insertions(+), 22 deletions(-)
delete mode 100644 id.tjo.space/containers/authentik-ldap.container
diff --git a/id.tjo.space/configure.sh b/id.tjo.space/configure.sh
index 1b35215..a07c42a 100755
--- a/id.tjo.space/configure.sh
+++ b/id.tjo.space/configure.sh
@@ -70,10 +70,3 @@ systemctl start authentik-server
echo "=== Setup Authentik Worker"
systemctl start authentik-worker
-
-echo "=== Setup Authentik LDAP"
-mkdir -p /etc/authentik
-cat <<EOF >/etc/authentik/ldap.secrets.env
-AUTHENTIK_TOKEN=${AUTHENTIK_LDAP_TOKEN}
-EOF
-systemctl start authentik-ldap
diff --git a/id.tjo.space/containers/authentik-ldap.container b/id.tjo.space/containers/authentik-ldap.container
deleted file mode 100644
index 622db3d..0000000
--- a/id.tjo.space/containers/authentik-ldap.container
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=An Authentik LDAP Server
-
-[Container]
-Image=ghcr.io/goauthentik/ldap:2025.2.1
-Environment=AUTHENTIK_HOST=https://next.id.tjo.space
-Environment=AUTHENTIK_INSECURE=false
-EnvironmentFile=/etc/authentik/ldap.secrets.env
-
-[Service]
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-After=authentik-server.service
diff --git a/id.tjo.space/containers/authentik-server.container b/id.tjo.space/containers/authentik-server.container
index 7109bd0..e9ebbbb 100644
--- a/id.tjo.space/containers/authentik-server.container
+++ b/id.tjo.space/containers/authentik-server.container
@@ -7,6 +7,7 @@ EnvironmentFile=/etc/authentik/authentik.env
EnvironmentFile=/etc/authentik/secrets.env
Volume=/srv/authentik/media:/media
Volume=/srv/authentik/custom-templates:/custom-templates
+Network=main.network
[Service]
Restart=always
diff --git a/id.tjo.space/containers/authentik-worker.container b/id.tjo.space/containers/authentik-worker.container
index bb8703f..f95e28c 100644
--- a/id.tjo.space/containers/authentik-worker.container
+++ b/id.tjo.space/containers/authentik-worker.container
@@ -9,6 +9,7 @@ EnvironmentFile=/etc/authentik/secrets.env
Volume=/srv/authentik/media:/media
Volume=/srv/authentik/certs:/certs
Volume=/srv/authentik/custom-templates:/custom-templates
+Network=main.network
[Service]
Restart=always
diff --git a/id.tjo.space/containers/caddy.container b/id.tjo.space/containers/caddy.container
index 1019514..0114a18 100644
--- a/id.tjo.space/containers/caddy.container
+++ b/id.tjo.space/containers/caddy.container
@@ -6,6 +6,7 @@ Image=docker.io/caddy:2.9
PublishPort=443:443
PublishPort=80:80
Volume=/etc/caddy:/etc/caddy:ro
+Network=main.network
[Service]
Restart=always
diff --git a/id.tjo.space/containers/postgresql.container b/id.tjo.space/containers/postgresql.container
index d736fa2..6003275 100644
--- a/id.tjo.space/containers/postgresql.container
+++ b/id.tjo.space/containers/postgresql.container
@@ -7,6 +7,7 @@ Volume=/srv/postgresql/data:/var/lib/postgresql/data
EnvironmentFile=/etc/postgresql/secrets.env
Environment=POSTGRES_USER=id.tjo.space
Environment=POSTGRES_DB=id.tjo.space
+Network=main.network
[Service]
Restart=always
diff --git a/id.tjo.space/containers/valkey.container b/id.tjo.space/containers/valkey.container
index cd473b1..23185e5 100644
--- a/id.tjo.space/containers/valkey.container
+++ b/id.tjo.space/containers/valkey.container
@@ -3,6 +3,7 @@ Description=A Valkey Container
[Container]
Image=docker.io/valkey/valkey:8
+Network=main.network
[Service]
Restart=always
diff --git a/id.tjo.space/secrets.env.encrypted b/id.tjo.space/secrets.env.encrypted
index 83a34560f9fc164300e567137e9a0512896925e1..5e478891183a2c532083b107596ba44e9b2a5e85 100644
GIT binary patch
delta 521
zcmV+k0`~oa1)c<uAb(*vRBA9rQZhnVL@-N7X*Wi0Z$d*^Sa@h-MNlwqQAtxlQ(;Oo
zGE!(mQ3^#=S4Lz{GAm?9a70uwVlrk>Q&2fCX*W4RQ)5>!YBYFjbZAjnF=k_JFbXX`
zAXqXrH8D9LH$iJvHd!(_PC`U?YDhRibv1ByF-%N3N;7e8Lw|C4V?{DYSTAE^HF88n
z3NUM7X-h;kSwU4{aAQG9a&JyrX+d^PGi7UcXF@Z2Ha2TcVnlH_GHgwA3N0-yAW%s(
zZ)jOIMn`ltcw}NPGdN3WWo<(%Gg(e~XhTzGXlg`mN@7_wG;c^r3c4`~IWke$=)T5i
zcj$Dlpq$q4Gk?I{;z<qY_}yd<HM6f#zP&Go2_uOC3W$?LHubd4$ul(uiNGXSW-LCS
zi5_R4Q5=`gS#`8Kg%o_OsqFK>4wQa6cLe8kUBiNd$@D|$_RzMIAYT0aKQx1{;)36p
zC&=ZMUVoJmmF>i_soxnhuG~<?VbFC?Pej!9oT)&MWPdZqhv$7}JcMjPDjlmKq7((v
zU5C$f$`YFg5XWf***(6F_+W?7`&GQXcVfQ>skq;VA(GXsd97pL4Dre9ivg|SpZa;*
zq{9JV5l-{YN)@iNl;xu)6VJ3PaG34g+SjwtCGbyg&;>G5ps`rarK|q8pChjbsGTL;
LFNka^asp1OylC6Y
delta 621
zcmV-z0+Rin1cC*SAb)dsM^Z{ic1uDySz0hnX)7^LR(euQS2c5Mb60k1QAcrMby;<7
zLP}vWK?+4TQDSyyVpmpELS}C<Z+b>|Mo&dDX+&pqLn~J?buU>kV^3^qXGu^vGzu*~
zAXqXrH8D9LIYcoqPc%nXF-2l8QEf0oc653$dQo{nZhA>lNPlE_WH2&NGjCQ%R4YeK
z3RZPFXG=;|S43x5a&B)pYiKYuL~%4yc1lKVOHXD|VmM-GWHLxbG&X5x3N0-yAT}~s
zP%~OpXE-@bHEMG>QC3TOV{deGML2R<Ggfw0L^ez{VPRG^XIU>v3NayJv`oemYuiqP
zQQdjXpP#GTVt>K*q`IjRVvJu|rS>r1$3;h`RAFAp(h5#SlQN*O4-s%|ueUh*rFg3n
zN}5Deg4sYl31U1LhM;bnR}SLW_N<;s^*tBsH;3Reo_sk-X)!~E$ai21YUF8Ser(GY
zqRZm?a0JF_gj_+XYKT{AR{c&kws9y<kNF$@y_Y}tw0~8U33)y;kQ7yHw;ZF~F=3$s
zsB~~<jsgc0X)EVaIO&^;6igo(6W4Pj`v?*27asNSF5<}%C~2Fdja2=4`;t@RtTNOh
zyE?z%-Q6zbg%=Gsk^3;b+@M@k6+#y%Atj3JyGk)UR>7>Mt=*cW)EV7?q_Rt5eH&uB
z85=WxG-jAI-VjTB>Ti>841WM`EGo<On0zHm)g6kKsH-Zvh|W#dyLWem8Yb3#94u_1
zNR;1Etqxd!U_7YWq$wG*Y&yEoqDP&+U|?rS7d-EN2G89}y8NFK-y_Szs3n;wRPeFp
H<L6w3E`tEt