Skip to content

Allow operators to disable updating system ca #507

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

Open
maxnoe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow operators to disable updating system ca #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 1 deletion daemons/start-daemon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,14 @@ then
done
fi

if [ -d /etc/grid-security/certificates ]; then
# allow operators to disable updating the system trust store
UPDATE_SYSTEM_TRUST="${UPDATE_SYSTEM_TRUST:-1}"
if [[ "$UPDATE_SYSTEM_TRUST" == "1" && -d /etc/grid-security/certificates ]]; then
echo 'Adding Grid CAs to the system trust.'
cp -v /etc/grid-security/certificates/*.pem /etc/pki/ca-trust/source/anchors/
update-ca-trust extract
else
echo "Skipping system trust update."
fi

echo "starting daemon with: $RUCIO_DAEMON $RUCIO_DAEMON_ARGS"
Expand Down
8 changes: 6 additions & 2 deletions server/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,16 @@ then
done
fi

if [ -d /etc/grid-security/certificates ]; then
# allow operators to disable updating the system trust store
UPDATE_SYSTEM_TRUST="${UPDATE_SYSTEM_TRUST:-1}"
if [[ "$UPDATE_SYSTEM_TRUST" == "1" && -d /etc/grid-security/certificates ]]; then
echo 'Adding Grid CAs to the system trust.'
cp -v /etc/grid-security/certificates/*.pem /etc/pki/ca-trust/source/anchors/
update-ca-trust extract
else
echo "Skipping system trust update."
fi

pkill httpd || :
sleep 2
exec httpd -D FOREGROUND
exec httpd -D FOREGROUND
6 changes: 5 additions & 1 deletion ui/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,14 @@ then
done
fi

if [ -d /etc/grid-security/certificates ]; then
# allow operators to disable updating the system trust store
UPDATE_SYSTEM_TRUST="${UPDATE_SYSTEM_TRUST:-1}"
if [[ "$UPDATE_SYSTEM_TRUST" == "1" && -d /etc/grid-security/certificates ]]; then
echo 'Adding Grid CAs to the system trust.'
cp -v /etc/grid-security/certificates/*.pem /etc/pki/ca-trust/source/anchors/
update-ca-trust extract
else
echo "Skipping system trust update."
fi


Expand Down