-
Notifications
You must be signed in to change notification settings - Fork 421
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Put mod_vcard config options in a map #3553
Conversation
Codecov Report
@@ Coverage Diff @@
## master #3553 +/- ##
=======================================
Coverage 79.23% 79.24%
=======================================
Files 420 420
Lines 32263 32256 -7
=======================================
- Hits 25564 25560 -4
+ Misses 6699 6696 -3
Continue to review full report at Codecov.
|
This comment was marked as outdated.
This comment was marked as outdated.
ad44bdc
to
1480f71
Compare
This comment was marked as outdated.
This comment was marked as outdated.
1480f71
to
75318ab
Compare
This comment was marked as outdated.
This comment was marked as outdated.
82e7f66
to
d67591f
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
d67591f
to
01d77d7
Compare
small_tests_24 / small_tests / 01d77d7 small_tests_23 / small_tests / 01d77d7 dynamic_domains_mysql_redis_24 / mysql_redis / 01d77d7 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 01d77d7 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 01d77d7 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 01d77d7 ldap_mnesia_24 / ldap_mnesia / 01d77d7 ldap_mnesia_23 / ldap_mnesia / 01d77d7 internal_mnesia_24 / internal_mnesia / 01d77d7 pgsql_mnesia_23 / pgsql_mnesia / 01d77d7 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 01d77d7 mysql_redis_24 / mysql_redis / 01d77d7 pgsql_mnesia_24 / pgsql_mnesia / 01d77d7 mssql_mnesia_24 / odbc_mssql_mnesia / 01d77d7 riak_mnesia_24 / riak_mnesia / 01d77d7 |
01d77d7
to
ba516c1
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
3ae563a
to
8884675
Compare
This comment was marked as outdated.
This comment was marked as outdated.
The values are used only when the Riak backend is specified.
8884675
to
b1ee098
Compare
small_tests_24 / small_tests / b1ee098 small_tests_23 / small_tests / b1ee098 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / b1ee098 dynamic_domains_mysql_redis_24 / mysql_redis / b1ee098 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / b1ee098 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / b1ee098 ldap_mnesia_23 / ldap_mnesia / b1ee098 ldap_mnesia_24 / ldap_mnesia / b1ee098 internal_mnesia_24 / internal_mnesia / b1ee098 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / b1ee098 pgsql_mnesia_23 / pgsql_mnesia / b1ee098 pgsql_mnesia_24 / pgsql_mnesia / b1ee098 mysql_redis_24 / mysql_redis / b1ee098 mssql_mnesia_24 / odbc_mssql_mnesia / b1ee098 riak_mnesia_24 / riak_mnesia / b1ee098 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, I think that we could rework some LDAP fields later (if we need to). I only added one suggestion, that we might utilize in the future.
<<"ldap_pool_tag">> => default, | ||
<<"ldap_uids">> => [{<<"uid">>, <<"%u">>}], | ||
<<"ldap_vcard_map">> => mod_vcard_ldap:default_vcard_map(), | ||
<<"ldap_search_fields">> => mod_vcard_ldap:default_search_fields(), | ||
<<"ldap_search_reported">> => mod_vcard_ldap:default_search_reported(), | ||
<<"ldap_search_operator">> => 'and', | ||
<<"ldap_binary_search_fields">> => [] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a note: how about putting all these options in a nested map ldap
and treating them like riak
? I know it's a change in config structure, but for me it looks like a change for the better? It could be done in a separate PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was thinking about it, and even some LDAP options are shared between different modules using LDAP. There could be a section defined in the mongoose_ldap_config
with the common options.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the change, the options that the user would specify would be, for example modules.mod_vcard.ldap.pool_tag
instead of modules.mod_vcard.ldap_pool_tag
, correct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think we could do it separately, in MAM I could also move the options into subsections, but it would be too much of a change in one go.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I'd rather do it separately as well
mod_vcard
opts put in maps with defaults. LDAP options should probably be reworked after all modules that use them will have maps and sane defaults. Some small fixes to documentation and code.