Skip to content

Commit

Permalink
Fixes #16745: when upgrding rudder from 5.0 to 6.0, the rudder-pkg re…
Browse files Browse the repository at this point in the history
…staure pkg cannot restart correctly Jetty, so rudder-upgrade doesn't checkk compatibility, and rudder cannot start
  • Loading branch information
ncharles committed Feb 21, 2020
1 parent 0cd1a99 commit 93cf813
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions rudder-webapp/SOURCES/rudder-webapp-postinst
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,6 @@ if [ $LDAPCHK -eq 0 ]; then
/opt/rudder/bin/rudder-init no auto
fi

# Restore the plugins before checking them
if [ -f /tmp/rudder-plugins-upgrade ]
then
/opt/rudder/bin/rudder-pkg plugin restore-status < /tmp/rudder-plugins-upgrade
fi

# Run any upgrades
echo "INFO: Launching script to check if a migration is needed ..."
/opt/rudder/bin/rudder-upgrade >> ${LOG_FILE}
Expand All @@ -168,6 +162,13 @@ echo "Done"
# Adjust permissions on /var/rudder/configuration-repository
/opt/rudder/bin/rudder-fix-repository-permissions >> ${LOG_FILE}

# Restore the plugins and checking them
if [ -f /tmp/rudder-plugins-upgrade ]
then
rudder package plugin restore-status < /tmp/rudder-plugins-upgrade
rudder package check-compatibility
rudder package rudder-postupgrade
fi

cd /
[ -f /tmp/rudder-hooks-upgrade ] && setfacl --restore=/tmp/rudder-hooks-upgrade
Expand Down

0 comments on commit 93cf813

Please sign in to comment.