From 7a80e9e3ba150340233c01fb089ddb6ed5ea7a00 Mon Sep 17 00:00:00 2001 From: Jens Sandmann <jens@sandzwerg.de> Date: Sun, 15 Oct 2017 03:55:27 +0200 Subject: [PATCH] =?UTF-8?q?ldap:=20enviroment=20synthax=20auf=20docker-com?= =?UTF-8?q?pose=20abge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webserver/docker_ldap/tasks/main.yml | 42 ++++--------------- .../docker_ldap/templates/docker-compose.yml | 33 +++++++++++++++ 2 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 webserver/docker_ldap/templates/docker-compose.yml diff --git a/webserver/docker_ldap/tasks/main.yml b/webserver/docker_ldap/tasks/main.yml index 9a603ab1..2baa63af 100644 --- a/webserver/docker_ldap/tasks/main.yml +++ b/webserver/docker_ldap/tasks/main.yml @@ -32,38 +32,12 @@ path: "/srv/ldap/config" state: "directory" -- name: start ldap docker - docker_container: - name: ldap-service - image: osixia/openldap:1.1.6 - hostname: ldap-service - state: started - restart_policy: always - volumes: - - /srv/ldap/database:/var/lib/ldap - - /srv/ldap/config:/etc/ldap/slapd.d - env: - LDAP_ORGANISATION: Warpzone - LDAP_DOMAIN: warpzone.ms - LDAP_ADMIN_PASSWORD: "{{ ldap_admin_pass }}" - LDAP_READONLY_USER: true - LDAP_READONLY_USER_USERNAME: readonly - LDAP_READONLY_USER_PASSWORD: "{{ ldap_readonly_pass }}" - ports: - - "{{ ldap_ip_ext }}:389:389" - - "{{ ldap_ip_ext }}:636:636" +- name: Docker Compose Konfig-Datei erstellen + template: + src: "docker-compose.yml" + dest: "/srv/ldap/docker-compose.yml" -- name: start phpldapadmin docker - docker_container: - name: phpldapadmin-app - image: osixia/phpldapadmin:0.6.11 - state: started - restart_policy: always - env: - PHPLDAPADMIN_LDAP_HOSTS: ldap-host - PHPLDAPADMIN_HTTPS: false - PHPLDAPADMIN_TRUST_PROXY_SSL: true - links: - - ldap-service:ldap-host - ports: - - 127.0.0.1:42004:80 +- name: start openldap docker + docker_service: + project_src: /srv/ldap/ + state: present diff --git a/webserver/docker_ldap/templates/docker-compose.yml b/webserver/docker_ldap/templates/docker-compose.yml new file mode 100644 index 00000000..a1b126d6 --- /dev/null +++ b/webserver/docker_ldap/templates/docker-compose.yml @@ -0,0 +1,33 @@ + +version: "3" + +services: + + openldap: + image: osixia/openldap:1.1.6 + restart: always + ports: + - "{{ ldap_ip_ext }}:389:389" + - "{{ ldap_ip_ext }}:636:636" + volumes: + - /srv/ldap/database:/var/lib/ldap + - /srv/ldap/config:/etc/ldap/slapd.d + environment: + - LDAP_ORGANISATION=Warpzone + - LDAP_DOMAIN=warpzone.ms + - LDAP_ADMIN_PASSWORD="{{ ldap_admin_pass }}" + - LDAP_READONLY_USER=true + - LDAP_READONLY_USER_USERNAME=readonly + - LDAP_READONLY_USER_PASSWORD="{{ ldap_readonly_pass }}" + + phpldapadmin: + image: osixia/phpldapadmin:0.6.11 + restart: always + depends_on: + - openldap + ports: + - 127.0.0.1:42004:80 + environment: + - PHPLDAPADMIN_LDAP_HOSTS=openldap + - PHPLDAPADMIN_HTTPS=false + - PHPLDAPADMIN_TRUST_PROXY_SSL=true -- GitLab