Skip to content

SOFTWARE-6149: actually propagate detected config changes #126

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

Merged
matyasselmeci merged 2 commits into from
Jun 20, 2025
Merged

SOFTWARE-6149: actually propagate detected config changes #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b78fd7
SOFTWARE-6149: actually propagate detected config changes
brianhlin Jun 20, 2025
18418ea
Address some shellcheck warnings
brianhlin Jun 20, 2025
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
2 changes: 1 addition & 1 deletion base/etc/osg/image-config.d/20-osg-ce-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ EOF
echo "Running OSG configure.."
# Run the OSG Configure script to set up bosco
mkdir -p /var/cache/osg/
cat /etc/osg/config.d/* | sha256sum > /var/cache/osg/config-sha256.txt
sha256sum /etc/osg/config.d/* > /var/cache/osg/config-sha256.txt
osg-configure -c --verbose VERBOSE

# Cert stuff
Expand Down
9 changes: 6 additions & 3 deletions base/usr/local/bin/osg-configure-cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ fi

cached_checksum_dir=/var/cache/osg/
cached_checksum_path=$cached_checksum_dir/config-sha256.txt
config_checksum=$(cat /etc/osg/config.d/* | sha256sum)

config_dir=/etc/osg/config.d/
config_checksum=$(sha256sum "$config_dir/*")
cached_config_checksum=$(cat "$cached_checksum_path" 2> /dev/null)

if [[ -z $cached_config_checksum ]]; then
Expand All @@ -20,9 +22,10 @@ if [[ -z $cached_config_checksum ]]; then
echo "$config_checksum" > "$cached_checksum_path"
fi

if [[ $config_checksum == $cached_config_checksum ]]; then
echoerr "No changes detected in /etc/osg/config.d, exiting."
if [[ $config_checksum == "$cached_config_checksum" ]]; then
echoerr "No changes detected in $config_dir, exiting."
exit 0
fi

cp "/tmp/$config_dir/*.ini" /etc/osg/config.d
osg-configure -c