Skip to content

fix(upgrade-pkg): Only restart services in jails when related packages are upgraded #15

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
frikilax wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(upgrade-pkg): Only restart services in jails when related packages are upgraded #15

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
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- [COMMON] Use new mongodb `connect` command to interact with all versions of DB
- [UPGRADE-PKG] Restart GUI/Portal services only at the end of an upgrade
### Fixed
- [UPGRADE-PKG] Only restart jail service(s) when corresponding package is upgraded


## [1.0.4] - 2025-10-29
Expand Down
77 changes: 44 additions & 33 deletions usr/local/share/vulture-utils/upgrade-pkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,50 +243,61 @@ for jail in "haproxy" "redis" "mongodb" "rsyslog" ; do

/bin/echo "[+] Updating jail $jail packages..."
IGNORE_OSVERSION="yes" /usr/sbin/pkg -j "$jail" update -f || finalize 1 "Could not update list of packages for jail ${jail}"
# shellcheck disable=SC2086
IGNORE_OSVERSION="yes" /usr/sbin/pkg -j "$jail" upgrade ${_pkg_options} -y || finalize 1 "Could not upgrade packages for jail ${jail}"
echo "[-] Ok."

# Upgrade vulture-$jail AFTER, in case of "pkg -j $jail upgrade" has removed some permissions... (like redis)
/bin/echo "[+] Updating vulture-$jail package..."
# shellcheck disable=SC2086
IGNORE_OSVERSION="yes" /usr/sbin/pkg upgrade ${_pkg_options} -y "vulture-$jail" || finalize 1 "Could not upgrade vulture-${jail}"
echo "[-] Ok."

echo "[+] Restarting services..."
case "$jail" in
rsyslog)
/usr/sbin/jexec "$jail" /usr/sbin/service rsyslogd restart
/usr/sbin/jexec "$jail" /usr/sbin/service filebeat restart
rsyslog_need_restart="$(/usr/sbin/pkg upgrade -n vulture-rsyslog 2>&1 >/dev/null; echo $?)"
[ "$rsyslog_need_restart" -eq 1 ] || rsyslog_need_restart="$(/usr/sbin/pkg -j rsyslog upgrade -ng "*rsyslog*" 2>&1 >/dev/null; echo $?)"
filebeat_need_restart="$(/usr/sbin/pkg -j rsyslog upgrade -ng "*beat*" 2>&1 >/dev/null; echo $?)"
;;
mongodb)
/usr/sbin/jexec "$jail" /usr/sbin/service mongod restart
# TODO Force disable pageexec and mprotect on the mongo executable
# there seems to be a bug currently with secadm when rules are pre-loaded on executables in packages
# which is the case for latest mongodb36-3.6.23
/usr/sbin/jexec "$jail" /usr/sbin/hbsdcontrol pax disable pageexec /usr/local/bin/mongo
/usr/sbin/jexec "$jail" /usr/sbin/hbsdcontrol pax disable mprotect /usr/local/bin/mongo
mongodb_need_restart="$(/usr/sbin/pkg -j mongodb upgrade -ng "mongodb*" 2>&1 >/dev/null; echo $?)"
;;
redis)
/usr/sbin/jexec "$jail" /usr/sbin/service sentinel stop
/usr/sbin/jexec "$jail" /usr/sbin/service redis restart
/usr/sbin/jexec "$jail" /usr/sbin/service sentinel start
redis_need_restart="$(/usr/sbin/pkg -j redis upgrade -ng "redis*" 2>&1 >/dev/null; echo $?)"
;;
haproxy)
if /usr/sbin/jexec "$jail" /usr/sbin/service haproxy status > /dev/null ; then
# Reload gracefully
/bin/echo "[*] reloading haproxy service..."
/usr/sbin/jexec "$jail" /usr/sbin/service haproxy reload
else
# Start service
/bin/echo "[*] starting haproxy service..."
/usr/sbin/jexec "$jail" /usr/sbin/service haproxy start
fi
;;
*)
/usr/sbin/jexec "$jail" /usr/sbin/service "$jail" restart
haproxy_need_restart="$(/usr/sbin/pkg upgrade -n vulture-haproxy 2>&1 >/dev/null; echo $?)"
[ "$haproxy_need_restart" -eq 1 ] || haproxy_need_restart="$(/usr/sbin/pkg -j haproxy upgrade -ng "*haproxy*" 2>&1 >/dev/null; echo $?)"
;;
esac

# shellcheck disable=SC2086
IGNORE_OSVERSION="yes" /usr/sbin/pkg -j "$jail" upgrade ${_pkg_options} -y || finalize 1 "Could not upgrade packages for jail ${jail}"
echo "[-] Ok."

# Upgrade vulture-$jail AFTER, in case of "pkg -j $jail upgrade" has removed some permissions... (like redis)
/bin/echo "[+] Updating vulture-$jail package..."
# shellcheck disable=SC2086
IGNORE_OSVERSION="yes" /usr/sbin/pkg upgrade ${_pkg_options} -y "vulture-$jail" || finalize 1 "Could not upgrade vulture-${jail}"
echo "[-] Ok."

echo "[+] Restarting services..."
if [ "$rsyslog_need_restart" -eq 1 ]; then
/usr/sbin/jexec rsyslog /usr/sbin/service rsyslogd restart
fi
if [ "$filebeat_need_restart" -eq 1 ]; then
/usr/sbin/jexec rsyslog /usr/sbin/service filebeat restart
fi
if [ "$mongodb_need_restart" -eq 1 ]; then
/usr/sbin/jexec mongodb /usr/sbin/service mongod restart
fi
if [ "$redis_need_restart" -eq 1 ]; then
/usr/sbin/jexec redis /usr/sbin/service sentinel stop
/usr/sbin/jexec redis /usr/sbin/service redis restart
/usr/sbin/jexec redis /usr/sbin/service sentinel start
fi
if [ "$haproxy_need_restart" -eq 1 ]; then
if /usr/sbin/jexec haproxy /usr/sbin/service haproxy status > /dev/null ; then
# Reload gracefully
/bin/echo "[*] reloading haproxy service..."
/usr/sbin/jexec haproxy /usr/sbin/service haproxy reload
else
# Start service
/bin/echo "[*] starting haproxy service..."
/usr/sbin/jexec haproxy /usr/sbin/service haproxy start
fi
fi
echo "[-] Ok."
echo "[-] $jail updated."
fi
Expand Down