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

Document extra reason to allow not existing dir in EXTRA_CONF_DIRS, fix unable to change Twitcher logging level #410

Merged
merged 9 commits into from
Dec 11, 2023
Merged

Document extra reason to allow not existing dir in EXTRA_CONF_DIRS, fix unable to change Twitcher logging level #410

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
172ba13
certbotwrapper: update comment where var BASH_IMAGE comes from
tlvu Jul 27, 2023
efaad29
Merge remote-tracking branch 'origin/master' into update-code-comment
tlvu Sep 20, 2023
838ee0f
config: document another reason to allow not existing conf dir in EXT…
tlvu Sep 20, 2023
62ac0fa
Merge remote-tracking branch 'origin/master' into update-code-comment
tlvu Dec 9, 2023
6e60c56
CHANGES: extra reason to allow not existing dir in `EXTRA_CONF_DIRS`
tlvu Dec 9, 2023
bda91a7
twitcher: fix unable to change log level because of typo in qualname …
tlvu Dec 9, 2023
f5f0e41
Merge remote-tracking branch 'origin/master' into update-code-comment
tlvu Dec 11, 2023
a527e99
update comment per review feedback
tlvu Dec 11, 2023
eb75106
Bump version: 2.0.0 → 2.0.1
tlvu Dec 11, 2023
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
7 changes: 6 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
## Changes
- Code documentation: provide an additional reason to not exit early if a directory listed in the `EXTRA_CONF_DIRS` variable does not exist.

## Fixes
- Twitcher: unable to change log level because of typo in qualname config


[2.0.0](https://github.com/bird-house/birdhouse-deploy/tree/2.0.0) (2023-12-11)
------------------------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/twitcher/twitcher.ini.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ handlers = console
# "level = WARN" only potential problems/unexpected results reported, such as when caching is employed
level = ${TWITCHER_LOG_LEVEL}
handlers =
qualname = twitcher
qualname = TWITCHER

# MagpieAdapter or any other Magpie utilities it employs through Twitcher proxy-adapter security check
[logger_magpie]
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/deployment/certbotwrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SAVED_PWD="`pwd`"

. "$THIS_DIR/../read-configs.include.sh"

# Get PAVICS_FQDN_PUBLIC, PAVICS_FQDN, SUPPORT_EMAIL, SSL_CERTIFICATE.
# Get PAVICS_FQDN_PUBLIC, PAVICS_FQDN, SUPPORT_EMAIL, SSL_CERTIFICATE, BASH_IMAGE.
read_configs

CERT_DOMAIN="$PAVICS_FQDN_PUBLIC"
Expand Down
8 changes: 8 additions & 0 deletions birdhouse/read-configs.include.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@ source_conf_files() {
# fix immediately.
# The new adir with typo will not be active but at least all the existing
# will still work.
#
# Allowing not existing conf dir also helps for smooth
# transition of component path when they are new/renamed/deleted.
#
# New component names can be added to EXTRA_CONF_DIRS before the
# corresponding PR are merged and old component names can be removed
# after the corresponding PR are merge without any impact on the
# autodeploy process.
echo "WARNING: '$adir' in $conf_locations does not exist" 1>&2
fi
if [ -f "$adir/default.env" ]; then
Expand Down
Loading