Fixes for jdbcstore, jdbcconfig & jndi #699
Open
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
NyakudyaA
requested changes
Nov 6, 2024
| @@ -556,6 +556,13 @@ function setup_jdbc_db_config() { | |||
| else | |||
| envsubst < /build_data/jdbcconfig/jdbcconfig.properties > "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties | |||
| fi | |||
|
|
|||
| # Set jndiName if POSTGRES_JNDI is set to true | |||
| sed -i '/^jndiName=/d' "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties | |||
There was a problem hiding this comment.
shouldn't this line be inside the if statement?
| fi | ||
|
|
||
| # Set jndiName if POSTGRES_JNDI is set to true | ||
| sed -i '/^jndiName=/d' "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.properties |
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.
Hi there,
this is my first contribution to this project, so please give me feedback if there is anything I can do better.
This commit fixes two problems, I experienced while using it for a larger deployment:
jdbcstore.propertiespropertiesinstead ofjdbcstore.propertiesThe first issue is solved by just fixing the filename. The second issue is fixed by adding the respective line to enable jndi in jdbcconfig / jdbcstore.
if you need more details to understand these problems, please let me know.
Hope this helps :)