Fix inconsistent env var naming for LDAP filter configuration

There was a naming inconsitency for the enviroment variables used to define
LDAP filters for user and groups queries. Some services used `LDAP_USER_FILTER`
while others used `LDAP_USERFILTER`. This is now changed to use `LDAP_USER_FILTER`
and `LDAP_GROUP_FILTER`

Closes: #3890

deployments/examples/oc10_ocis_parallel/config/oc10/ldap-config.tmpl.json

@@ -24,7 +24,7 @@
       "s01ldap_expert_uuid_user_attr": "{{ .Env.LDAP_USER_SCHEMA_UID }}",
       "s01ldap_group_display_name": "{{ .Env.LDAP_GROUP_SCHEMA_DISPLAYNAME }}",
       "s01ldap_group_filter_mode": "0",
-      "s01ldap_group_filter": "{{ .Env.LDAP_GROUPFILTER }}",
+      "s01ldap_group_filter": "{{ .Env.LDAP_GROUP_FILTER }}",
       "s01ldap_group_member_assoc_attribute": "{{ .Env.LDAP_GROUP_MEMBER_ASSOC_ATTR }}",
       "s01ldap_groupfilter_groups": "",
       "s01ldap_groupfilter_objectclass": "",
@@ -46,7 +46,7 @@
       "s01ldap_user_filter_mode": "0",
       "s01ldap_userfilter_groups": "",
       "s01ldap_userfilter_objectclass": "",
-      "s01ldap_userlist_filter": "{{ .Env.LDAP_USERFILTER }}",
+      "s01ldap_userlist_filter": "{{ .Env.LDAP_USER_FILTER }}",
       "s01use_memberof_to_detect_membership": "1"
     }
   }

deployments/examples/oc10_ocis_parallel/docker-compose.yml

@@ -90,7 +90,7 @@ services:
       LDAP_GROUP_SCHEMA_ID: "cn"
       LDAP_GROUP_SCHEMA_MAIL: "mail"
       LDAP_GROUP_SCHEMA_MEMBER: "cn"
-      LDAP_GROUPFILTER: "(objectclass=owncloud)"
+      LDAP_GROUP_FILTER: "(objectclass=owncloud)"
       LDAP_LOGIN_ATTRIBUTES: "uid"
       LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com"
       LDAP_USER_OBJECTCLASS: "posixAccount"
@@ -98,7 +98,7 @@ services:
       LDAP_USER_SCHEMA_ID: "ownclouduuid"
       LDAP_USER_SCHEMA_MAIL: "mail"
       LDAP_USER_SCHEMA_USERNAME: "cn"
-      LDAP_USERFILTER: "(objectclass=owncloud)"
+      LDAP_USER_FILTER: "(objectclass=owncloud)"
       # ownCloudSQL storage driver
       STORAGE_USERS_DRIVER: "owncloudsql"
       STORAGE_USERS_OWNCLOUDSQL_DATADIR: "/mnt/data/files"
@@ -168,11 +168,11 @@ services:
       LDAP_LOGINFILTER: "(&(objectclass=owncloud)(|(uid=%uid)(mail=%uid)))"
       LDAP_GROUP_SCHEMA_DISPLAYNAME: "cn"
       LDAP_USER_SCHEMA_NAME_ATTR: "uid"
-      LDAP_GROUPFILTER: "(&(objectclass=groupOfUniqueNames)(objectclass=owncloud))"
+      LDAP_GROUP_FILTER: "(&(objectclass=groupOfUniqueNames)(objectclass=owncloud))"
       LDAP_USER_SCHEMA_UID: "ownclouduuid"
       LDAP_USERATTRIBUTEFILTERS: "" #"ownclouduuid;cn;uid;mail"
       LDAP_USER_SCHEMA_MAIL: "mail"
-      LDAP_USERFILTER: "(&(objectclass=owncloud))"
+      LDAP_USER_FILTER: "(&(objectclass=owncloud))"
       LDAP_GROUP_MEMBER_ASSOC_ATTR: "uniqueMember"
       # ownCloud config
       OWNCLOUD_DB_TYPE: mysql

deployments/examples/ocis_ldap/docker-compose.yml

@@ -61,10 +61,10 @@ services:
       LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com"
       LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin}
       LDAP_GROUP_BASE_DN: "dc=owncloud,dc=com"
-      LDAP_GROUPFILTER: "(objectclass=owncloud)"
+      LDAP_GROUP_FILTER: "(objectclass=owncloud)"
       LDAP_GROUP_OBJECTCLASS: "groupOfUniqueNames"
       LDAP_USER_BASE_DN: "dc=owncloud,dc=com"
-      LDAP_USERFILTER: "(objectclass=owncloud)"
+      LDAP_USER_FILTER: "(objectclass=owncloud)"
       LDAP_USER_OBEJECTCLASS: "inetOrgPerson"
       LDAP_LOGIN_ATTRIBUTES: "uid,mail"
       IDP_LDAP_URI: ldap://ldap-server