diff --git a/roles/docker-ldap/tasks/main.yml b/roles/docker-ldap/tasks/main.yml index 6b886065..9f56e323 100644 --- a/roles/docker-ldap/tasks/main.yml +++ b/roles/docker-ldap/tasks/main.yml @@ -19,6 +19,11 @@ state: absent when: not applications.ldap.openldap.expose_to_internet | bool +- name: create docker network for LDAP, so that other applications can access it + docker_network: + name: central_ldap + state: present + - name: "create {{docker_compose.files.docker_compose}}" template: src: "docker-compose.yml.j2" diff --git a/roles/docker-ldap/templates/docker-compose.yml.j2 b/roles/docker-ldap/templates/docker-compose.yml.j2 index 6c04ea84..1cacc6ba 100644 --- a/roles/docker-ldap/templates/docker-compose.yml.j2 +++ b/roles/docker-ldap/templates/docker-compose.yml.j2 @@ -25,9 +25,11 @@ services: image: bitnami/openldap:{{applications.ldap.openldap.version}} container_name: openldap {% include 'roles/docker-compose/templates/services/base.yml.j2' %} +{% if applications.ldap.openldap.expose_to_internet | bool %} ports: - 127.0.0.1:{{ldap_localhost_port}}:{{ldap_localhost_port}} # Expose just on localhost so that nginx stream proxy can use it - 127.0.0.1:{{ldap_secure_localhost_port}}:{{ldap_secure_localhost_port}} # Expose just on localhost +{% endif %} volumes: - 'data:/bitnami/openldap' healthcheck: diff --git a/templates/docker/compose/networks.yml.j2 b/templates/docker/compose/networks.yml.j2 index 13bb4abf..3f4a3dc7 100644 --- a/templates/docker/compose/networks.yml.j2 +++ b/templates/docker/compose/networks.yml.j2 @@ -4,8 +4,9 @@ networks: central_{{ database_type }}: external: true {% endif %} -{% if ldap_network_enabled %} +{% if ldap_network_enabled | bool %} central_ldap: + external: true {% endif %} default: {% if application_id in networks.local and networks.local[application_id].subnet is defined %} diff --git a/templates/docker/container/networks.yml.j2 b/templates/docker/container/networks.yml.j2 index 3e0b926a..0d5b5230 100644 --- a/templates/docker/container/networks.yml.j2 +++ b/templates/docker/container/networks.yml.j2 @@ -3,7 +3,7 @@ {% if enable_central_database | bool and database_type is defined %} central_{{ database_type }}: {% endif %} -{% if ldap_network_enabled %} +{% if ldap_network_enabled | bool %} central_ldap: {% endif %} default: