Skip to content
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.

Sign up for GitHub

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

Fixes for jdbcstore, jdbcconfig & jndi #699

Merged
merged 6 commits into from
Nov 8, 2024
+125 −30
Merged

Fixes for jdbcstore, jdbcconfig & jndi #699

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cae3168
fix: jdbcstore.properties wrong filename
tldev-de Nov 5, 2024
b074649
fix: allow usage of jndi with jdbcconfig & jdbcstore
tldev-de Nov 5, 2024
b89cf5b
fix review comments
Nov 8, 2024
7fde4ce
fix download error
Nov 8, 2024
4d0def8
add tests for using jndi
NyakudyaA Nov 8, 2024
309453f
Use same postgis version in tests
NyakudyaA Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions scripts/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,13 @@ function setup_jdbc_db_config() {
envsubst < "${EXTRA_CONFIG_DIR}"/jdbcconfig.properties > "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties
else
envsubst < /build_data/jdbcconfig/jdbcconfig.properties > "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties
if [[ ${POSTGRES_JNDI} =~ [Tt][Rr][Uu][Ee] ]];then
# Set jndiName if POSTGRES_JNDI is set to true
sed -i '/^jndiName=/d' "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties
echo "jndiName=java:comp/env/jdbc/postgres" >> "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties
fi
fi

check_jdbc_config_table=$(psql -d "$POSTGRES_DB" -p "$POSTGRES_PORT" -U "$POSTGRES_USER" -h "$HOST" -tAc "SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'object_property')")
if [[ ${check_jdbc_config_table} = "t" ]]; then
sed -i 's/initdb=true/initdb=false/g' "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties
Expand Down Expand Up @@ -586,9 +592,14 @@ function setup_jdbc_db_store() {
envsubst < /build_data/jdbcconfig/jdbcconfig.properties > "${GEOSERVER_DATA_DIR}"/jdbcconfig/jdbcconfig.properties
fi
if [[ -f "${EXTRA_CONFIG_DIR}"/jdbcstore.properties ]]; then
envsubst < "${EXTRA_CONFIG_DIR}"/jdbcstore.properties > "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.propertiesproperties
envsubst < "${EXTRA_CONFIG_DIR}"/jdbcstore.properties > "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.properties
else
envsubst < /build_data/jdbcstore/jdbcstore.properties > "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.propertiesproperties
envsubst < /build_data/jdbcstore/jdbcstore.properties > "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.properties
if [[ ${POSTGRES_JNDI} =~ [Tt][Rr][Uu][Ee] ]];then
# Set jndiName if POSTGRES_JNDI is set to true
sed -i '/^jndiName=/d' "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.properties
echo "jndiName=java:comp/env/jdbc/postgres" >> "${GEOSERVER_DATA_DIR}"/jdbcstore/jdbcstore.properties
fi
fi

check_jdbc_store_table=$(psql -d "$POSTGRES_DB" -p "${POSTGRES_PORT}" -U "${POSTGRES_USER}" -h "${HOST}" -tAc "SELECT EXISTS(SELECT 1 from information_schema.tables where table_name = 'resources')")
Expand Down
Loading