From b28253d6507ff8327fcc339dcbfd005e6f2eec61 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 22 Jun 2020 09:39:37 +0200 Subject: [PATCH] try to reload proxmox-backup-proxy on package upgrade --- debian/postinst | 35 +++++++++++++++++++++++++++++ debian/prerm | 10 +++++++++ debian/rules | 6 ++--- etc/proxmox-backup-proxy.service.in | 2 +- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 debian/postinst create mode 100644 debian/prerm diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 00000000..ee31737c --- /dev/null +++ b/debian/postinst @@ -0,0 +1,35 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + configure) + # modeled after dh_systemd_start output + systemctl --system daemon-reload >/dev/null || true + if [ -n "$2" ]; then + _dh_action=try-restart + else + _dh_action=start + fi + deb-systemd-invoke $_dh_action proxmox-backup.service >/dev/null || true + + if [ -n "$2" ]; then + _dh_action=try-reload-or-restart + else + _dh_action=start + fi + deb-systemd-invoke $_dh_action proxmox-backup-proxy.service >/dev/null || true + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 00000000..77f9eaff --- /dev/null +++ b/debian/prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +# modeled after dh_systemd_start output +if [ -d /run/systemd/system ] && [ "$1" = remove ]; then + deb-systemd-invoke stop 'proxmox-backup-banner.service' 'proxmox-backup-proxy.service' 'proxmox-backup.service' >/dev/null || true +fi diff --git a/debian/rules b/debian/rules index 7d0067db..6f4dc80f 100755 --- a/debian/rules +++ b/debian/rules @@ -37,9 +37,9 @@ override_dh_auto_install: PROXY_USER=backup \ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) -override_dh_installinit: - dh_installinit - dh_installinit --name proxmox-backup-proxy +override_dh_installsystemd: + # note: we start/try-reload-restart services manually in postinst + dh_installsystemd --no-start --no-restart-after-upgrade # workaround https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933541 # TODO: remove once available (Debian 11 ?) diff --git a/etc/proxmox-backup-proxy.service.in b/etc/proxmox-backup-proxy.service.in index d233f7b9..e389a565 100644 --- a/etc/proxmox-backup-proxy.service.in +++ b/etc/proxmox-backup-proxy.service.in @@ -2,7 +2,7 @@ Description=Proxmox Backup API Proxy Server Wants=network-online.target After=network.target -Requires=proxmox-backup.service +Wants=proxmox-backup.service After=proxmox-backup.service [Service]