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.

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

Don't try to chown SSLDIR if it's read-only or we don't have permission #49

Merged
merged 1 commit into from
Feb 6, 2024
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions puppetdb/docker-entrypoint.d/20-configure-ssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ if [ "$USE_PUPPETSERVER" = true ]; then
sed -i '/^# ssl-/s/^# //g' /etc/puppetlabs/puppetdb/conf.d/jetty.ini
fi

# make sure Java apps running as puppetdb can read these files
echo "Setting ownership for $SSLDIR to puppetdb:puppetdb"
chown -R puppetdb:puppetdb ${SSLDIR}
if [ -w "$SSLDIR" ] && [ "$(id -un)" = "root" ]; then
# make sure Java apps running as puppetdb can read these files
echo "Setting ownership for $SSLDIR to puppetdb:puppetdb"
chown -R puppetdb:puppetdb ${SSLDIR}
fi