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.

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

Jump to bottom

Fixes #21329: conffiles must be restored after a divert #2627

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Fixes #21329: conffiles must be restored after a divert #2627

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
12 changes: 12 additions & 0 deletions rudder-relay/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ case "$1" in
CFRUDDER_FIRST_INSTALL=0
if [ -z "${2}" ]; then CFRUDDER_FIRST_INSTALL=1; fi

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

/opt/rudder/share/package-scripts/rudder-relay-postinst "${CFRUDDER_FIRST_INSTALL}" "apache2" "www-data" "www-data" "apache2/sites-available" "0"
;;

Expand Down