Fixes #18475: add software index in ldap #2380
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ncharles
reviewed
Nov 3, 2020
rudder-webapp/SOURCES/rudder-upgrade
Outdated
| if [ ${INDEX_COUNT} -eq 0 ]; then | ||
| echo "Adding LDAP index on attribute: software" | ||
| sed -i "/index\s*objectClass\s*eq/a index\tsoftware\teq" ${SLAPD_CONF} | ||
| NEED_REINDEX=true |
There was a problem hiding this comment.
you need to change also the logic below to check for the new index as well
There was a problem hiding this comment.
i would simply
INDEX_BKP_COUNT=$(grep -c "^index\s*software\s*eq" ${SLAPD_CONF_BKP} 2>/dev/null || true)
if [ ${INDEX_BKP_COUNT} -eq 0 ]; then
NEED_REINDEX=true
fi
|
PR updated with a new commit |
ncharles
approved these changes
Nov 4, 2020
|
This PR is not mergeable to upper versions. |
|
OK, squash merging this PR |
VinceMacBuche
force-pushed
the
bug_18475/add_software_index_in_ldap
branch
from
0c5c54e
to
29235d3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/18475