From 8567a9b71905a32f021d124112eaa230fa933469 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Sun, 1 Dec 2019 17:43:56 -0500 Subject: [PATCH] Fix upgrade issue broken by 802e7a1f4d315a1bd10c1dfae259f6779f940ed0 --- setup/management.sh | 2 +- setup/munin.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/management.sh b/setup/management.sh index e4fd75da..3caf8eea 100755 --- a/setup/management.sh +++ b/setup/management.sh @@ -93,7 +93,7 @@ source $venv/bin/activate exec python `pwd`/management/daemon.py EOF chmod +x $inst_dir/start -cp -f conf/mailinabox.service /lib/systemd/system/mailinabox.service +cp --remove-destination conf/mailinabox.service /lib/systemd/system/mailinabox.service # target was previously a symlink so remove it first hide_output systemctl link -f /lib/systemd/system/mailinabox.service hide_output systemctl daemon-reload hide_output systemctl enable mailinabox.service diff --git a/setup/munin.sh b/setup/munin.sh index b052ef0f..6799cad6 100755 --- a/setup/munin.sh +++ b/setup/munin.sh @@ -64,7 +64,7 @@ mkdir -p /var/lib/munin-node/plugin-state/ # Create a systemd service for munin. ln -sf $(pwd)/management/munin_start.sh /usr/local/lib/mailinabox/munin_start.sh chmod 0744 /usr/local/lib/mailinabox/munin_start.sh -cp -f conf/munin.service /lib/systemd/system/munin.service +cp --remove-destination conf/munin.service /lib/systemd/system/munin.service # target was previously a symlink so remove first hide_output systemctl link -f /lib/systemd/system/munin.service hide_output systemctl daemon-reload hide_output systemctl unmask munin.service