filter_plugins/configuration_filters.py

@@ -13,7 +13,7 @@ def get_oidc_enabled(applications, application_id):
     return bool(enabled)
 
 def get_features_iframe(applications, application_id):
-    app = applications.get(application_id, {})
+    app = applications.get(application_id)
     enabled = app.get('features', {}).get('iframe', False)
     return bool(enabled)
 

roles/docker-espocrm/templates/docker-compose.yml.j2

@@ -3,7 +3,7 @@ services:
 {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
 
   web:
-    image: espocrm/espocrm:{{ applications[application_id].version }}
+    image: espocrm/espocrm:{{ applications.espocrm.version }}
 {% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
@@ -15,7 +15,7 @@ services:
       - data:/var/www/html
 
   daemon:
-    image: espocrm/espocrm:{{ applications[application_id].version }}
+    image: espocrm/espocrm:{{ applications.espocrm.version }}
     restart: {{docker_restart_policy}}
     logging:
       driver: journald
@@ -25,7 +25,7 @@ services:
       - data:/var/www/html
 
   websocket:
-    image: espocrm/espocrm:{{ applications[application_id].version }}
+    image: espocrm/espocrm:{{ applications.espocrm.version }}
     restart: {{docker_restart_policy}}
     logging:
       driver: journald

roles/docker-ldap/tasks/create_nextcloud_schema.yml

@@ -1,32 +0,0 @@
-- name: "pkgmgr install"
-  include_role:
-    name: pkgmgr-install
-  vars:
-    package_name: ldapsm
-
-- name: Ensure custom LDAP schema snippet via ldapsm
-  vars:
-    schema_name: "nextcloud"
-    attribute_defs:
-      - "( 1.3.6.1.4.1.99999.1 NAME 'nextcloudQuota' DESC 'Quota for Nextcloud' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )"
-    objectclass_defs:
-      - "( 1.3.6.1.4.1.99999.2 NAME 'nextcloudUser' DESC 'Auxiliary class for Nextcloud attributes' AUXILIARY MAY ( nextcloudQuota ) )"
-  command: >
-    ldapsm
-      -s {{ ldap_server_uri }}
-      -D '{{ ldap_bind_dn }}'
-      -W '{{ ldap_bind_pw }}'
-      -n {{ schema_name }}
-      {% for at in attribute_defs %}
-      -a "{{ at }}"
-      {% endfor %}
-      {% for oc in objectclass_defs %}
-      -c "{{ oc }}"
-      {% endfor %}
-  register: ldapsm_result
-  changed_when: "'Created schema entry' in ldapsm_result.stdout"
-  check_mode: no
-
-- name: Show ldapsm output
-  debug:
-    var: ldapsm_result.stdout_lines

roles/docker-ldap/tasks/main.yml

@@ -49,12 +49,36 @@
       - python-ldap
     state: present
 
-- name: "Include Nextcloud Schema"
+- name: Create Nextcloud Schema
-  include_tasks: create_nextcloud_schema.yml
+  ldap_entry:
-  vars:
+    dn: "cn=nextcloud,cn=schema,cn=config"
-    ldap_server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.ldap }}"
+    objectClass:
-    ldap_bind_dn:    "cn={{ applications.ldap.users.administrator.username }},cn=config"
+      - top
-    ldap_bind_pw:    "{{ applications.ldap.administrator_password }}"
+      - olcSchemaConfig
+    attributes:
+      cn: nextcloud
+      olcAttributeTypes:
+        - >-
+          ( 1.3.6.1.4.1.99999.1
+            NAME 'nextcloudQuota'
+            DESC 'Quota for Nextcloud'
+            EQUALITY integerMatch
+            ORDERING integerOrderingMatch
+            SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+            SINGLE-VALUE
+          )
+      olcObjectClasses:
+        - >-
+          ( 1.3.6.1.4.1.99999.2
+            NAME 'nextcloudUser'
+            DESC 'Auxiliary class for Nextcloud attributes'
+            AUXILIARY
+            MAY ( nextcloudQuota )
+          )
+    server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.ldap }}"
+    bind_dn: "cn={{ applications.ldap.users.administrator.username }},cn=config"
+    bind_pw: "{{ applications.ldap.administrator_password }}"
+    state: present
 
 ###############################################################################
 # 1) Create the LDAP entry if it does not yet exist