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

Fixes #21658: rudder-server fails to upgrade #2660

Merged
Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions rudder-server/debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ case "$1" in
RUDDER_FIRST_INSTALL="true"
fi

# bring back diverts in case thay contain user modifications
# move to avoid doing it twice
if [ -f /opt/rudder/etc/rudder-apache-webapp-ssl.conf.distrib ]; then
mv /opt/rudder/etc/rudder-apache-webapp-ssl.conf.distrib /opt/rudder/etc/rudder-apache-webapp-ssl.conf
fi

# common apache modules must be handled in rudder-relay because they are needed
# to restart apache properly and avoid Pre Dependencies which are complex to handle

Expand Down
5 changes: 5 additions & 0 deletions rudder-server/debian/preinst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ set -e

case "$1" in
install)
dpkg-divert --add --rename --package rudder-server /opt/rudder/etc/rudder-apache-webapp-common.conf
dpkg-divert --add --rename --package rudder-server /opt/rudder/etc/rudder-apache-webapp-nossl.conf
dpkg-divert --add --rename --package rudder-server /opt/rudder/etc/rudder-apache-webapp-ssl.conf
dpkg-divert --add --rename --package rudder-server /opt/rudder/etc/rudder-jetty.conf

mkdir -p /opt/rudder/etc
echo 'root' > /opt/rudder/etc/uuid.hive
mkdir -p /var/rudder/cfengine-community/
Expand Down