From f0d2c5f5cfe58cca9f11c13c10614eb1918877ae Mon Sep 17 00:00:00 2001 From: boxswapper Date: Wed, 25 Mar 2026 14:36:20 -0600 Subject: [PATCH] working without lemonldap --- deploy_matrix.yml | 34 ++++------------------------------ vars/vars.yml | 21 ++------------------- 2 files changed, 6 insertions(+), 49 deletions(-) diff --git a/deploy_matrix.yml b/deploy_matrix.yml index 662940b..5a1aa8e 100644 --- a/deploy_matrix.yml +++ b/deploy_matrix.yml @@ -40,9 +40,6 @@ - "{{ npm_data }}" - "{{ npm_letsencrypt }}" - "{{ lemonldap_data }}" - - "{{ lemonldap_cfg }}" - - "{{ lemonldap_lib }}" - - "{{ lemonldap_nginx }}" # ----------------------------------------------------------------- # Pull required images (including Teamspeak) @@ -78,9 +75,9 @@ name: "{{ db_image }}" state: present - - name: Pull LemonLDAP image + - name: Pull Keycloak Image containers.podman.podman_image: - name: "{{ lemonldap_image }}" + name: "{{ keycloak_image }}" state: present # ----------------------------------------------------------------- @@ -167,7 +164,7 @@ # Start the Matrix-Synaps and supporting DB containers # ----------------------------------------------------------------- - - name: start Database container + - name: start Matrix Database container containers.podman.podman_container: name: synapse-db image: "{{ db_image }}" @@ -247,27 +244,4 @@ network: "{{ podman_network }}" restart_policy: always - # ----------------------------------------------------------------- - # LemonLDAP-NG - #------------------------------------------------------------------ - - name: Start LemonLDAP container - containers.podman.podman_container: - name: "{{ lemonldap_container_name }}" - image: "{{ lemonldap_image }}" - state: started - env: - SSODOMAIN="{{ top_domain }}" - PORTAL_HOSTNAME="{{ ldap_portal_hostname }}" - MANAGER_HOSTNAME="{{ ldap_manager_hostname }}" - HANDLER_HOSTNAME="{{ ldap_handler_hostname }}" - PORT="{{ lemonldap_port }}" - FASTCGI_LISTEN_PORT="{{ lemonldap_cgi_port }}" - IPV4_only="true" - PRESERVEFILES="/etc/lemonldap-ng /var/lib/lemonldap-ng/conf /var/lib/lemonldap-ng/sessions /var/lib/lemonldap-ng/psessions /etc/nginx/sites-enabled" - volumes: - - "{{ lemonldap_cfg }}:/etc/lemonldap-ng:Z" - - "{{ lemonldap_data }}:/usr/share:Z" - - "{{ lemonldap_lib }}:/var/lib/lemonldap-ng:Z" - - "{{ lemonldap_nginx }}:/etc/nginx/sites-enabled:Z" - network: "{{ podman_network }}" - restart_policy: always \ No newline at end of file + \ No newline at end of file diff --git a/vars/vars.yml b/vars/vars.yml index e14f5f7..0f16483 100644 --- a/vars/vars.yml +++ b/vars/vars.yml @@ -10,9 +10,7 @@ turn_domain: "turn.fpov.space" matrix_email: "boxswappers@gmail.com" admin_domain: "mtxadm.fpov.space" element_domain: "element.fpov.space" -ldap_manager_hostname: "manager.fpov.space" -ldap_handler_hostname: "reload.fpov.space" -ldap_portal_hostname: "auth.fpov.space" + # -------------------------------------------------------------- # Ports # -------------------------------------------------------------- @@ -58,8 +56,7 @@ npm_image: "docker.io/jc21/nginx-proxy-manager:latest" teamspeak_image: "docker.io/teamspeak:latest" synapse_admin_image: "docker.io/awesometechnologies/synapse-admin:latest" element_image: "docker.io/vectorim/element-web:latest" -lemonldap_image: "docker.io/lemonldapng/lemonldap-ng:latest" - +keycloak_image: "quay.io/keycloak/keycloak:26.5.6" # -------------------------------------------------------------- # Podman names & volumes @@ -74,10 +71,6 @@ vol_teamspeak: teamspeak_data npm_data: npm_data npm_letsencrypt: letsencrypt vol_db: postgres_db -lemonldap_data: ldap_data -lemonldap_cfg: ldap_cfg -lemonldap_lib: ldap_lib -lemonldap_nginx: ldap_nginx # -------------------------------------------------------------- # Paths on the target host (temporary files) @@ -124,13 +117,3 @@ landing_message: | automatic Let’s Encrypt certificates, a TURN server for voice/video, and a simple landing page. -# -------------------------------------------------------------- -# Lemon LDAP -# -------------------------------------------------------------- -lemonldap_container_name: "lemon" -lemonldap_http_port: "8118" -lemonldap_https_port: "444" -lemonldap_port: "80" -lemonldap_cgi_port: "9000" - -ldap_ssodomain: "auth.fpov.space" \ No newline at end of file