From a4103962fca97bf217c3abd53f611634a4f81f5b Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Sat, 16 Dec 2023 13:35:16 +0000 Subject: [PATCH] bpq config move --- debian/NEWS | 11 +++++++++++ debian/changelog | 6 ++++++ debian/dirs | 1 + debian/install | 2 +- debian/linbpq.service | 2 +- debian/patches/makefile | 4 ++-- debian/preinst | 12 ++++++++++++ 7 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 debian/NEWS create mode 100644 debian/preinst diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..e0aefbc --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,11 @@ +linbpq (6.0.24.22-2) UNRELEASED; urgency=medium + + This is quite a big update, with config moving from /opt/oarc/bpq/bpq32.cfg to + /etc/bpq32.cfg. The system shall do this automatically for you, however + computers and their programmers are not perfect. + + I strongly recommend at this point backing up your entire + /opt/oarc/bpq/ directory (cp -r /opt/oarc/bpq/ ~/bpq-backup/) before + proceeding with the upgrade + + -- Dave Hibberd Sat, 16 Dec 2023 13:30:06 +0000 diff --git a/debian/changelog b/debian/changelog index d0ca8b4..019b549 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linbpq (6.0.24.22-2) UNRELEASED; urgency=medium + + * Moved config file home, caused chaos + + -- Dave Hibberd Sat, 16 Dec 2023 13:30:06 +0000 + linbpq (6.0.24.22-1) unstable; urgency=medium * New Upstream Release diff --git a/debian/dirs b/debian/dirs index 5cac53f..10a5980 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1 +1,2 @@ +usr/sbin opt/oarc/bpq diff --git a/debian/install b/debian/install index e4a0e92..fb787b0 100644 --- a/debian/install +++ b/debian/install @@ -1 +1 @@ -debian/templates/bpq32.cfg opt/oarc/bpq +debian/templates/bpq32.cfg etc/bpq32.cfg diff --git a/debian/linbpq.service b/debian/linbpq.service index 34ed587..3b46a5d 100644 --- a/debian/linbpq.service +++ b/debian/linbpq.service @@ -2,7 +2,7 @@ After=network.target [Service] -ExecStart=/opt/oarc/bpq/linbpq +ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/linbpq -l /opt/oarc/linbpq/logs WorkingDirectory=/opt/oarc/bpq Restart=always User=linbpq diff --git a/debian/patches/makefile b/debian/patches/makefile index d663e6c..2132816 100644 --- a/debian/patches/makefile +++ b/debian/patches/makefile @@ -8,8 +8,8 @@ +# setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq + +install: -+ install -b -m 755 -D -d debian/linbpq/opt/oarc/bpq -+ install -b -m 755 -s -p linbpq debian/linbpq/opt/oarc/bpq ++ install -b -m 755 -D -d debian/usr/sbin ++ install -b -m 755 -s -p linbpq debian/usr/sbin -include *.d diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..8ba52dd --- /dev/null +++ b/debian/preinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +confile="/etc/bpq32.cfg" +node="/opt/oarc/bpq/bpq32.cfg" + +if [ -L $confile ]; then + rm $confile + cp $node $confile + rm $node +fi