diff --git a/debian/chaosdorf-admin-toolkit.postrm b/debian/chaosdorf-admin-toolkit.postrm deleted file mode 100644 index cbad4e1..0000000 --- a/debian/chaosdorf-admin-toolkit.postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = remove -o "$1" = abort-install -o "$1" = disappear ]; then - dpkg-divert --package chaosdorf-admin-toolkit --rename --remove \ - /etc/etckeeper/etckeeper.conf -fi - -#DEBHELPER# diff --git a/debian/chaosdorf-admin-toolkit.preinst b/debian/chaosdorf-admin-toolkit.preinst deleted file mode 100644 index e0d9db7..0000000 --- a/debian/chaosdorf-admin-toolkit.preinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = install -o "$1" = upgrade ]; then - dpkg-divert --package chaosdorf-admin-toolkit --add --rename --divert \ - /etc/etckeeper/etckeeper.conf.etckeeper \ - /etc/etckeeper/etckeeper.conf -fi - -#DEBHELPER# diff --git a/debian/install b/debian/install index 2c8f936..84ffb22 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,3 @@ -etckeeper/etckeeper.conf etc/etckeeper forcecommand/forcecommand usr/lib/nagios/ forcecommand/nagios etc/forcecommand/ forcecommand/backup etc/forcecommand/ diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf index b87e8e0..0d73208 100644 --- a/etckeeper/etckeeper.conf +++ b/etckeeper/etckeeper.conf @@ -1,3 +1,6 @@ +# Part of chaosdorf-admin-toolkit +# Only edit in the git repo + VCS="git" GIT_COMMIT_OPTIONS="-v" diff --git a/fabfile.py b/fabfile.py index 9a39c7d..75f08bc 100644 --- a/fabfile.py +++ b/fabfile.py @@ -14,3 +14,6 @@ def deploy(version): run("dpkg --install /tmp/chaosdorf-admin-toolkit_%s_all.deb" % version) run('etckeeper post-install') run("rm /tmp/chaosdorf-admin-toolkit_%s_all.deb" % version) + +def configs(): + put('etckeeper/etckeeper.conf', '/etc/etckeeper/')