Merge pull request #2 from Diesel-Net/development

Promotion

Author: tomdaley92

.ansible/deploy.yaml

@@ -2,19 +2,8 @@
 
 - hosts: tools
   strategy: linear
-  roles:
-    - common
-
   tasks:
 
-    - include_role:
-        name: common
-        tasks_from: make_config_dir
-
-    - include_role:
-        name: common
-        tasks_from: make_data_dir
-
     - include_role:
         name: docker
         tasks_from: stack_deploy

.ansible/group_vars/all/config.yaml

@@ -0,0 +1,7 @@
+# UID/GID auto increment starting number.
+# we want this relatively high so that we don't clash with other linux accounts on systems
+
+auto_number:
+  min:
+    uid: 2000
+    gid: 2000

.ansible/templates/docker-compose.yaml.j2

@@ -3,18 +3,17 @@
 version: '3.8'
 services: 
 
-
   main:
     image: osixia/phpldapadmin:0.9.0
     volumes:
       - /etc/localtime:/etc/localtime
-      - {{ ssl_cert_dir }}:/container/service/phpldapadmin/assets/apache2/certs
+      - {{ ssl_cert_dir }}:/container/service/ldap-client/assets/certs
     environment:
       PHPLDAPADMIN_HTTPS: 'false'
       PHPLDAPADMIN_LDAP_CLIENT_TLS: 'true'
-      PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME: {{ ssl_cert_filename }}
-      PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT: try
-      PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'{{ domain }}': [{'server': [{'tls': False}, {'port': 389}]},{'login': [{'bind_id': 'cn=admin,dc=diesel,dc=net'},{'bind_pass': '{{ admin_password }}'}]}]}]"
+      PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT: demand
+      PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME: {{ ssl_cert_filename }}
+      PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'{{ domain }}': [{'server': [{'tls': True}, {'port': 389}]}, {'login': [{'bind_id': 'cn=admin,dc=diesel,dc=net'}, {'bind_pass': '{{ admin_password }}'}]}, {'auto_number': [{'min': \"array('uidNumber'=>{{auto_number.min.uid}}, 'gidNumber'=>{{auto_number.min.gid}})\"}]}]}]"
     command: >
       --loglevel debug
     deploy: