Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

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

webserver/docker_ldap/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  openldap:
+    image: osixia/openldap:1.1.10
+    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.7.1
+    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