fix: detect correct init when interacting with rsyslog on install
This change also skips running a restart of rsyslog as during install, the service isn't properly initiated. While this breaks upgrades of Dokku within containers, that is not how upgrades of container-based Dokku should work, so this is a fine trade-off.
This commit is contained in:
@@ -72,8 +72,39 @@ EOF
|
|||||||
flag_rsyslog_needs_restart=y
|
flag_rsyslog_needs_restart=y
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -f "$DOKKU_RSYSLOG_FILTER" && "$flag_rsyslog_needs_restart" == "y" ]]; then
|
local systemctl_path=/bin/systemctl
|
||||||
service rsyslog restart
|
if [[ -x /usr/bin/systemctl ]]; then
|
||||||
|
systemctl_path=/usr/bin/systemctl
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f "$DOKKU_RSYSLOG_FILTER" ]] && [[ "$flag_rsyslog_needs_restart" == "y" ]]; then
|
||||||
|
case "$DOKKU_DISTRO" in
|
||||||
|
debian | raspbian)
|
||||||
|
if [[ -x "$systemctl_path" ]]; then
|
||||||
|
systemctl restart rsyslog
|
||||||
|
else
|
||||||
|
/usr/sbin/invoke-rc.d rsyslog restart
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
ubuntu)
|
||||||
|
if [[ "$DOKKU_INIT_SYSTEM" == "sv" ]]; then
|
||||||
|
# avoid failing runit init calls on install
|
||||||
|
# the runit binaries are not yet available during dockerfile building
|
||||||
|
true
|
||||||
|
elif [[ -x "$systemctl_path" ]]; then
|
||||||
|
systemctl restart rsyslog
|
||||||
|
elif [[ -x /usr/bin/sv ]]; then
|
||||||
|
# avoid failing runit init calls on install
|
||||||
|
# the runit binaries are not yet available during dockerfile building
|
||||||
|
true
|
||||||
|
else
|
||||||
|
invoke-rc.d rsyslog restart
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
arch)
|
||||||
|
systemctl restart rsyslog
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename "$0")" "$@"
|
[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename "$0")" "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user