From 5580eed634ef1c7ef1f26064b1ea027fcb35c004 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 7 Mar 2024 11:00:57 +0100
Subject: [PATCH] Remove phpldapadmin

---
 .env.dist          |  1 -
 docker-compose.yml | 41 -----------------------------------------
 tests/.env.test1   |  1 -
 3 files changed, 43 deletions(-)

diff --git a/.env.dist b/.env.dist
index 63f279d..096fab2 100755
--- a/.env.dist
+++ b/.env.dist
@@ -34,7 +34,6 @@ ACME_COMMAND_ARGUMENTS=
 POSTFIX_VIRTUAL_ALIAS_DOMAINS=
 LDAP_PORT=
 LDAPS_PORT=
-PHPLDAPADMIN_SSL_PORT=8080
 
 # Replication
 DOVECOT_REPLICATION_SSL_VOLUME=
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b3c91c..cc93c8c 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -260,47 +260,6 @@ services:
         security_opt:
             - no-new-privileges:true
 
-    phpldapadmin:
-        logging:
-          driver: syslog
-          options:
-            tag: phpldapadmin
-        image: ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin:latest
-        mem_limit: 512M
-        mem_reservation: 100M
-        dns:
-            - "10.222.222.1"
-        hostname: phpldapadmin.mail-server.intranet
-        dns_search: mail-server.intranet.
-        networks:
-            mail_infra_network:
-                ipv4_address: 10.222.222.4
-                #ipv6_address: fd00:bee::4
-        restart: on-failure:5
-        environment:
-            PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'ldap.mail-server.intranet': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${LDAP_BASE_DN}'}]}]}]"
-            #PHPLDAPADMIN_HTTPS_CRT_FILENAME: "phpldapadmin-certificate.crt"
-            #PHPLDAPADMIN_HTTPS_KEY_FILENAME: "phpldapadmin-certificate.key"
-            #PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME: "${PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME:-phpldapadmin-ca.crt}"
-            #PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME: "ca.cer"
-        #volumes:
-        # web UI (phpldapadmin-ca.crt, phpldapadmin-certificate.key, phpldapadmin-certificate.crt)
-        #- ${ACME_HOME_DIR}/${DOMAIN_NAME}_ecc/ca.cer:/etc/ssl/server-certificate/ca.cer:ro
-        #- ${ACME_HOME_DIR}/${DOMAIN_NAME}_ecc/fullchain.cer:/etc/ssl/server-certificate/server.cer:ro
-        #- ${ACME_HOME_DIR}/${DOMAIN_NAME}_ecc/${DOMAIN_NAME}.key:/etc/ssl/server-certificate/server.key:ro
-        #- ${PHP_LDAP_ADMIN_CERTS_DIR}:/container/service/phpldapadmin/assets/apache2/certs
-        # LDAP client
-        #- ${ACME_HOME_DIR}/${DOMAIN_NAME}_ecc/ca.cer:/container/service/ldap-client/assets/certs/ca.cer:ro
-        ports:
-            - "${PHPLDAPADMIN_SSL_PORT:-8080}:80"
-        depends_on:
-            openldap:
-                condition: service_healthy
-            acme:
-                condition: service_healthy
-        security_opt:
-            - no-new-privileges:true
-
     acme:
         logging:
           driver: syslog
diff --git a/tests/.env.test1 b/tests/.env.test1
index 4379101..f91d569 100755
--- a/tests/.env.test1
+++ b/tests/.env.test1
@@ -32,7 +32,6 @@ POSTGREY_DELAY=1
 LDAP_PORT=10389
 LDAPS_PORT=10636
 LDAP_PROTOCOL=ldap
-PHPLDAPADMIN_SSL_PORT=8088
 
 # CrowdSec
 CROWDSEC_AGENT_USERNAME=