-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
node details overrides + logging utils (#415)
## Overview Add server details overrides and logging utilities. ## Changes **Non-breaking changes** - Compose script utilities: * Add `BIRDHOUSE_COLOR` option and various logging/messaging definitions in `birdhouse/scripts/logging.include.sh`. * Replace all explicit color "logging" related `echo` in scripts by utility variables `MSG_DEBUG`, `MSG_INFO`, `MSG_WARN` and `MSG_ERROR` as applicable per respective messages. * Unify all `birdhouse/scripts` utilities to employ the same `COMPOSE_DIR` variable (auto-resolved or explicitly set) in order to include or source any relevant dependencies they might have within the `birdhouse-deploy` repository. * Add `info` option (ie: `pavics-compose.sh info`) that will stop processing just before `docker-compose` call. This can be used to run a "dry-run" of the command and validate that was is loaded is as expected, by inspecting provided log messages. - Defaults: * Add multiple `SERVER_[...]` variables with defaults using previously hard coded values referring to PAVICS. These variables use a special combination of `DELAYED_EVAL` and `OPTIONAL_VARS` definitions that can make use of a variable formatted as `<ANY_NAME>='${__DEFAULT__<ANY_NAME>}'` that will print a warning messages indicating that the default is employed, although *STRONGLY* recommended to be overridden. This allows a middle ground between backward-compatible `env.local` while flagging potentially misused configurations. - Canarie-API: updated references * Use the new `SERVER_[...]` variables. * Replace the LICENSE URL of the server node pointing at [Ouranosinc/pavics-sdi](https://github.com/Ouranosinc/pavics-sdi) instead of intended [bird-house/birdhouse-deploy](https://github.com/bird-house/birdhouse-deploy). **Breaking changes** - n/a ## Related Issue / Discussion - Partially related to #414
- Loading branch information
Showing
44 changed files
with
763 additions
and
432 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,3 +29,4 @@ venv/ | |
|
||
## Testing | ||
.pytest_cache/ | ||
*.log |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.6 2024-02-15T16:29:01Z | ||
2.1.0 2024-02-23T20:32:41Z |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,17 @@ | ||
#!/bin/sh | ||
|
||
THIS_FILE="`realpath "$0"`" | ||
THIS_DIR="`dirname "$THIS_FILE"`" | ||
COMPOSE_DIR="$THIS_DIR/../.." | ||
THIS_FILE="$(readlink -f "$0" || realpath "$0")" | ||
THIS_DIR="$(dirname "${THIS_FILE}")" | ||
COMPOSE_DIR="${COMPOSE_DIR:-$(dirname "${THIS_DIR}/..")}" | ||
|
||
if [ -f "${COMPOSE_DIR}/read-configs.include.sh" ]; then | ||
. "${COMPOSE_DIR}/read-configs.include.sh" | ||
|
||
# resolve GEOSERVER_DATA_DIR | ||
read_configs | ||
fi | ||
|
||
if [ ! -f "${GEOSERVER_DATA_DIR}/global.xml" ]; then | ||
echo "fix GeoServer data dir permission on first run only, when data dir do not exist yet." | ||
FIRST_RUN_ONLY=1 "$COMPOSE_DIR"/deployment/fix-geoserver-data-dir-perm | ||
log INFO "fix GeoServer data dir permission on first run only, when data dir do not exist yet." | ||
FIRST_RUN_ONLY=1 "${COMPOSE_DIR}/deployment/fix-geoserver-data-dir-perm" | ||
fi |
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
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
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
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
Oops, something went wrong.