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 83a3456..5e47889 100644 Binary files a/id.tjo.space/secrets.env.encrypted and b/id.tjo.space/secrets.env.encrypted differ