Lauri Ojansivu 6 éve
szülő
commit
a06fd63690
3 módosított fájl, 10 hozzáadás és 10 törlés
  1. 1 1
      docker-compose-build.yml
  2. 1 1
      docker-compose.yml
  3. 8 8
      snap-src/bin/config

+ 1 - 1
docker-compose-build.yml

@@ -198,7 +198,7 @@ services:
       # example : LDAP_SYNC_USER_DATA=true
       # example : LDAP_SYNC_USER_DATA=true
       #- LDAP_SYNC_USER_DATA=false
       #- LDAP_SYNC_USER_DATA=false
       # LDAP_SYNC_USER_DATA_FIELDMAP :
       # LDAP_SYNC_USER_DATA_FIELDMAP :
-      # example : LDAP_SYNC_USER_DATA_FIELDMAP={\"cn\":\"name\", \"mail\":\"email\"}
+      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
       #- LDAP_SYNC_USER_DATA_FIELDMAP=
       #- LDAP_SYNC_USER_DATA_FIELDMAP=
       # LDAP_SYNC_GROUP_ROLES :
       # LDAP_SYNC_GROUP_ROLES :
       # example :
       # example :

+ 1 - 1
docker-compose.yml

@@ -187,7 +187,7 @@ services:
       # example : LDAP_SYNC_USER_DATA=true
       # example : LDAP_SYNC_USER_DATA=true
       #- LDAP_SYNC_USER_DATA=false
       #- LDAP_SYNC_USER_DATA=false
       # LDAP_SYNC_USER_DATA_FIELDMAP :
       # LDAP_SYNC_USER_DATA_FIELDMAP :
-      # example : LDAP_SYNC_USER_DATA_FIELDMAP={\"cn\":\"name\", \"mail\":\"email\"}
+      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
       #- LDAP_SYNC_USER_DATA_FIELDMAP=
       #- LDAP_SYNC_USER_DATA_FIELDMAP=
       # LDAP_SYNC_GROUP_ROLES :
       # LDAP_SYNC_GROUP_ROLES :
       # example :
       # example :

+ 8 - 8
snap-src/bin/config

@@ -218,19 +218,19 @@ DESCRIPTION_LDAP_GROUP_FILTER_OBJECTCLASS="The object class for filtering"
 DEFAULT_LDAP_GROUP_FILTER_OBJECTCLASS=""
 DEFAULT_LDAP_GROUP_FILTER_OBJECTCLASS=""
 KEY_LDAP_GROUP_FILTER_OBJECTCLASS="ldap-group-filter-objectclass"
 KEY_LDAP_GROUP_FILTER_OBJECTCLASS="ldap-group-filter-objectclass"
 
 
-DESCRIPTION_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=""
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="ldap-group-filter-id-attribute. Default: ''"
 DEFAULT_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=""
 DEFAULT_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=""
 KEY_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="ldap-group-filter-id-attribute"
 KEY_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="ldap-group-filter-id-attribute"
 
 
-DESCRIPTION_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=""
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="ldap-group-filter-member-attibute. Default: ''"
 DEFAULT_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=""
 DEFAULT_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=""
 KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="ldap-group-filter-member-attribute"
 KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="ldap-group-filter-member-attribute"
 
 
-DESCRIPTION_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=""
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="ldap-group-filter-group-member-format. Default: ''"
 DEFAULT_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=""
 DEFAULT_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=""
 KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="ldap-group-filter-member-format"
 KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="ldap-group-filter-member-format"
 
 
-DESCRIPTION_LDAP_GROUP_FILTER_GROUP_NAME=""
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-group-name. Default: ''"
 DEFAULT_LDAP_GROUP_FILTER_GROUP_NAME=""
 DEFAULT_LDAP_GROUP_FILTER_GROUP_NAME=""
 KEY_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-member-format"
 KEY_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-member-format"
 
 
@@ -246,19 +246,19 @@ DESCRIPTION_LDAP_USERNAME_FIELD="Which field contains the ldap username"
 DEFAULT_LDAP_USERNAME_FIELD=""
 DEFAULT_LDAP_USERNAME_FIELD=""
 KEY_LDAP_USERNAME_FIELD="ldap-username-field"
 KEY_LDAP_USERNAME_FIELD="ldap-username-field"
 
 
-DESCRIPTION_LDAP_MERGE_EXISTING_USERS=""
+DESCRIPTION_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users . Default: false"
 DEFAULT_LDAP_MERGE_EXISTING_USERS="false"
 DEFAULT_LDAP_MERGE_EXISTING_USERS="false"
 KEY_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users"
 KEY_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users"
 
 
-DESCRIPTION_LDAP_SYNC_USER_DATA=""
+DESCRIPTION_LDAP_SYNC_USER_DATA="ldap-sync-user-data . Default: false"
 DEFAULT_LDAP_SYNC_USER_DATA="false"
 DEFAULT_LDAP_SYNC_USER_DATA="false"
 KEY_LDAP_SYNC_USER_DATA="ldap-sync-user-data"
 KEY_LDAP_SYNC_USER_DATA="ldap-sync-user-data"
 
 
-DESCRIPTION_LDAP_SYNC_USER_DATA_FIELDMAP=""
+DESCRIPTION_LDAP_SYNC_USER_DATA_FIELDMAP="LDAP Sync User Data Fieldmap. Example: ldap-sync-user-data-fieldmap='{\"cn\":\"name\", \"mail\":\"email\"}'"
 DEFAULT_LDAP_SYNC_USER_DATA_FIELDMAP=""
 DEFAULT_LDAP_SYNC_USER_DATA_FIELDMAP=""
 KEY_LDAP_SYNC_USER_DATA_FIELDMAP="ldap-sync-user-data-fieldmap"
 KEY_LDAP_SYNC_USER_DATA_FIELDMAP="ldap-sync-user-data-fieldmap"
 
 
-DESCRIPTION_LDAP_SYNC_GROUP_ROLES=""
+DESCRIPTION_LDAP_SYNC_GROUP_ROLES="ldap-sync-group-roles . Default: '' (empty)."
 DEFAULT_LDAP_SYNC_GROUP_ROLES=""
 DEFAULT_LDAP_SYNC_GROUP_ROLES=""
 KEY_LDAP_SYNC_GROUP_ROLES="ldap-sync-group-roles"
 KEY_LDAP_SYNC_GROUP_ROLES="ldap-sync-group-roles"