Skip to content

SOFTWARE-6149: fix various issues with auto-config updater #131

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
brianhlin merged 3 commits into from
Jul 28, 2025
Merged

SOFTWARE-6149: fix various issues with auto-config updater #131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6839046
SOFTWARE-6149: don't leak temp dirs
brianhlin Jul 25, 2025
b32f67c
SOFTWARE-6149: ignore shellcheck, we want the glob
brianhlin Jul 25, 2025
56ce337
SOFTWARE-6149: remove absolute filename paths
brianhlin Jul 25, 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
6 changes: 4 additions & 2 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 @@ -19,8 +19,9 @@ staging_config_dir=$(mktemp -d)
rsync -a "$config_dir/" "$staging_config_dir"
rsync -a "$configmap_config_dir/" "$staging_config_dir"

config_checksum=$(sha256sum "$config_dir/*")
staging_config_checksum=$(sha256sum "$staging_config_dir/*")
# Remove absolute filename paths
config_checksum=$(sha256sum $config_dir/* | cut -d ' ' -f1)
staging_config_checksum=$(sha256sum $staging_config_dir/* | cut -d ' ' -f1)

if [[ $staging_config_checksum == "$config_checksum" ]]; then
echoerr "No changes detected in $configmap_config_dir, exiting."
Expand All @@ -32,3 +33,4 @@ fi
rsync -a --delete "$staging_config_dir/" "$config_dir/"
osg-configure -c
condor_ce_reconfig
rm -rf "$staging_config_dir"