diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/conntrackd.default | 2 | ||||
| -rwxr-xr-x | debian/conntrackd.init | 2 | ||||
| -rw-r--r-- | debian/conntrackd.install | 2 | ||||
| -rwxr-xr-x | debian/conntrackd.preinst | 17 |
5 files changed, 21 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 84a5454..21cfaf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ conntrack (1:0.9.8-1) UNRELEASED; urgency=low * new upstream release + * moved conntrackd.conf to /etc/conntrackd/conntrackd.conf (Closes: #477679) * updated home page to http://people.netfilter.org/pablo/conntrack-tools/ -- Max Kellermann <max@duempel.org> Mon, 27 Oct 2008 13:58:14 +0100 diff --git a/debian/conntrackd.default b/debian/conntrackd.default index 289e508..9926d79 100644 --- a/debian/conntrackd.default +++ b/debian/conntrackd.default @@ -1,5 +1,5 @@ # Which configuration file? -#CONFIG=/etc/conntrackd.conf +#CONFIG=/etc/conntrackd/conntrackd.conf # Additional options for daemon startup. #OPTIONS="" diff --git a/debian/conntrackd.init b/debian/conntrackd.init index dd28863..7ada3a9 100755 --- a/debian/conntrackd.init +++ b/debian/conntrackd.init @@ -22,7 +22,7 @@ DAEMON=/usr/sbin/conntrackd test -x $DAEMON || exit 0 -CONFIG=/etc/conntrackd.conf +CONFIG=/etc/conntrackd/conntrackd.conf OPTIONS="" test -f /etc/default/conntrackd && source /etc/default/conntrackd diff --git a/debian/conntrackd.install b/debian/conntrackd.install index 6d47172..c1e634d 100644 --- a/debian/conntrackd.install +++ b/debian/conntrackd.install @@ -1,4 +1,4 @@ debian/tmp/usr/sbin/conntrackd debian/tmp/usr/share/man/man8/conntrackd.8 -debian/conntrackd.conf etc +debian/conntrackd.conf etc/conntrackd doc/stats doc/sync usr/share/doc/conntrackd/examples diff --git a/debian/conntrackd.preinst b/debian/conntrackd.preinst new file mode 100755 index 0000000..1fae212 --- /dev/null +++ b/debian/conntrackd.preinst @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +action=$1 +version=$2 + +if [ "$action" = upgrade -a -n "$version" ] && + dpkg --compare-versions "$version" lt "1:0.9.8-1" && + test -f /etc/conntrackd.conf && + ! test -e /etc/conntrackd/conntrackd.conf; then + # package versions < 0.9.8-1 had the configuration file in a + # non-standard location + mkdir -p /etc/conntrackd + mv /etc/conntrackd.conf /etc/conntrackd/conntrackd.conf +fi + +#DEBHELPER# |