Refactored OAuth2 Proxy and PhpLDAPAdmin

roles/web-app-phpldapadmin/config/main.yml

@@ -1,18 +1,23 @@
-version:              "2.0.0-dev"
-oauth2_proxy:
-  application:        application  # Needs to be the same as webinterface
-  port:               8080         # application port
-  allowed_groups:
-    - "{{ [RBAC.GROUP.NAME, 'web-app-phpldapadmin-administrator'] | path_join }}"
 features:
-  matomo:             true
-  css:                true
-  desktop:    true
-  ldap:               true
-  oauth2:             true
+  matomo:   true
+  css:      true
+  desktop:  true
+  ldap:     true
+  oauth2:   true
   logout:   true
 server:
   domains:
     canonical:
       - phpldapadmin.{{ PRIMARY_DOMAIN }}
     aliases: []
+docker:
+  services:
+    phpldapadmin:
+      image:    leenooks/phpldapadmin
+      version:  "2.0.0-dev"
+    oauth2_proxy:
+      origin:
+        host: application  # Needs to be the same as webinterface
+        port: 8080         # application port
+      allowed_groups:
+        - "{{ [RBAC.GROUP.NAME, 'web-app-phpldapadmin-administrator'] | path_join }}"

roles/web-app-phpldapadmin/templates/docker-compose.yml.j2

@@ -2,7 +2,7 @@
 
   application:
     container_name: {{ application_id }}
-    image: leenooks/phpldapadmin:{{ applications | get_app_conf(application_id, 'version', True)}}
+    image: {{ PHPLDAPADMIN_IMAGE }}:{{ PHPLDAPADMIN_VERSION }}
     ports:
       - 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
 {% include 'roles/docker-container/templates/base.yml.j2' %}

roles/web-app-phpldapadmin/vars/main.yml

@@ -1 +1,5 @@
-application_id: "web-app-phpldapadmin"
+application_id: "web-app-phpldapadmin"
+entity_name:    "{{ application_id | get_entity_name }}"
+
+PHPLDAPADMIN_IMAGE:   "{{ applications | get_app_conf(application_id, 'docker.services.' ~ entity_name ~ '.image' )}}"
+PHPLDAPADMIN_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.' ~ entity_name ~ '.version' )}}"