remove sarge handholding
This commit is contained in:
parent
16dc82c697
commit
9f5862629d
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -5,6 +5,7 @@ nagios-plugins (1.4.11-3) UNRELEASED; urgency=low
|
||||||
* add missing descriptions to patches
|
* add missing descriptions to patches
|
||||||
* add missing command definition for check_ldaps, thanks Michael Renner
|
* add missing command definition for check_ldaps, thanks Michael Renner
|
||||||
<robe@amd.co.at> for reporting it (Closes: #407310)
|
<robe@amd.co.at> for reporting it (Closes: #407310)
|
||||||
|
* remove sarge handholding for configfiles migration
|
||||||
|
|
||||||
-- Jan Wagner <waja@cyconet.org> Fri, 07 Mar 2008 17:37:49 +0100
|
-- Jan Wagner <waja@cyconet.org> Fri, 07 Mar 2008 17:37:49 +0100
|
||||||
|
|
||||||
|
|
23
debian/functions
vendored
23
debian/functions
vendored
|
@ -1,35 +1,14 @@
|
||||||
# functions for use by nagios plugins maintainer scripts
|
# functions for use by nagios plugins maintainer scripts
|
||||||
|
|
||||||
npconfdir=/etc/nagios-plugins/config
|
npconfdir=/etc/nagios-plugins/config
|
||||||
npdpkgdir=/usr/share/nagios-plugins/dpkg
|
|
||||||
|
|
||||||
# determine whether the file is the default file shipped in sarge
|
# we now register all n-p config files via ucf.
|
||||||
# (called as is_pristine_sarge_file foo.cfg)
|
|
||||||
is_pristine_sarge_file(){
|
|
||||||
cfg="${npconfdir}/$1"
|
|
||||||
if [ -f "$cfg" ]; then
|
|
||||||
sargemd5=`grep "$cfg" ${npdpkgdir}/sarge.md5sums | cut -d' ' -f1`
|
|
||||||
curmd5=`md5sum "$cfg" | cut -d' ' -f1`
|
|
||||||
if [ "$curmd5" = "$sargemd5" ]; then return 0; fi
|
|
||||||
fi
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# we now register all n-p config files via ucf. this means
|
|
||||||
# we have to do a little bit of hand-holding for sarge migrations...
|
|
||||||
# (called as "register_cfgs $2" from postinst)
|
|
||||||
register_cfgs(){
|
register_cfgs(){
|
||||||
# do this in a subshell so we don't screw up cwd
|
# do this in a subshell so we don't screw up cwd
|
||||||
(
|
(
|
||||||
cd $templdir
|
cd $templdir
|
||||||
for f in *cfg; do
|
for f in *cfg; do
|
||||||
dest=${npconfdir}/$f
|
dest=${npconfdir}/$f
|
||||||
# if this is a first-time install and there are
|
|
||||||
# existing files (i.e. upgrading from sarge),
|
|
||||||
# help migrate files without annoying ucf prompts
|
|
||||||
if [ -z "$1" ] && is_pristine_sarge_file $f; then
|
|
||||||
cp $f $dest
|
|
||||||
fi
|
|
||||||
ucf $f $dest
|
ucf $f $dest
|
||||||
done
|
done
|
||||||
);
|
);
|
||||||
|
|
2
debian/rules
vendored
2
debian/rules
vendored
|
@ -156,7 +156,7 @@ install: build
|
||||||
# copy our dpkg-sourced functions etc into place
|
# copy our dpkg-sourced functions etc into place
|
||||||
mkdir -p ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg
|
mkdir -p ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg
|
||||||
install -t ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg \
|
install -t ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg \
|
||||||
$(DEBIANDIR)/functions $(DEBIANDIR)/sarge.md5sums
|
$(DEBIANDIR)/functions
|
||||||
|
|
||||||
# Build architecture-independent files here.
|
# Build architecture-independent files here.
|
||||||
binary-indep: build install
|
binary-indep: build install
|
||||||
|
|
33
debian/sarge.md5sums
vendored
33
debian/sarge.md5sums
vendored
|
@ -1,33 +0,0 @@
|
||||||
1481ee845a33c79a4bd4b6a53ac89d77 /etc/nagios-plugins/config/breeze.cfg
|
|
||||||
b4acc5ef300b41e5e75c9db0cf11d154 /etc/nagios-plugins/config/disk.cfg
|
|
||||||
c2d4a8a422a6a25e9221fad4ed4a4a27 /etc/nagios-plugins/config/dns.cfg
|
|
||||||
3fc5180cf1515cbef63d451e5afb6273 /etc/nagios-plugins/config/dummy.cfg
|
|
||||||
9f403fdfccad2af993cde754511b376d /etc/nagios-plugins/config/flexlm.cfg
|
|
||||||
df1333cd843b4f5cb5b0681802275354 /etc/nagios-plugins/config/ftp.cfg
|
|
||||||
ffec4c08adb333f0c6fb329abafe0162 /etc/nagios-plugins/config/games.cfg
|
|
||||||
57e88d475ad186685a6467a2fc77d176 /etc/nagios-plugins/config/hppjd.cfg
|
|
||||||
eca0973b19035c2d9b91d719bdc919b8 /etc/nagios-plugins/config/http.cfg
|
|
||||||
d436be53a9489272fd4998f5d823c166 /etc/nagios-plugins/config/ifstatus.cfg
|
|
||||||
d41d8cd98f00b204e9800998ecf8427e /etc/nagios-plugins/config/imap.cfg
|
|
||||||
5d97c58383a150f55ff43b1fff0a2ad2 /etc/nagios-plugins/config/ldap.cfg
|
|
||||||
5cea26d4b41d3373a2e1d16d24b3609e /etc/nagios-plugins/config/load.cfg
|
|
||||||
dcb6427e6ba3de3811314b54eed6f2e4 /etc/nagios-plugins/config/mail.cfg
|
|
||||||
a67214ed59c93d05025c3fd5bea2fea4 /etc/nagios-plugins/config/mrtg.cfg
|
|
||||||
b4df090d64b717f4bc66ebaa78401c35 /etc/nagios-plugins/config/mysql.cfg
|
|
||||||
9bd2da13876894ec2c580caca72be3e2 /etc/nagios-plugins/config/netware.cfg
|
|
||||||
a378095d089b97c640c77871ae1336fc /etc/nagios-plugins/config/news.cfg
|
|
||||||
891994fe75e49a7a6bda654dbc2a4aa3 /etc/nagios-plugins/config/nmap.cfg
|
|
||||||
8e5a7e9d0bf5ac56cdd3e87c2922d95b /etc/nagios-plugins/config/nt.cfg
|
|
||||||
2540f562f96df93837d77e3e92f6f694 /etc/nagios-plugins/config/ntp.cfg
|
|
||||||
5ce9b77e3bcc91d8d8f89f1f6cca9819 /etc/nagios-plugins/config/pgsql.cfg
|
|
||||||
13644acf70e30e10a9dad918ba423038 /etc/nagios-plugins/config/ping.cfg
|
|
||||||
79c29eeebb2c8b649a624d764771c924 /etc/nagios-plugins/config/procs.cfg
|
|
||||||
71f5d55c9f59ed00e7659d18593563ef /etc/nagios-plugins/config/radius.cfg
|
|
||||||
bbc757e85a4f5fa8640fc626f392a43e /etc/nagios-plugins/config/real.cfg
|
|
||||||
19e92ef89e7abf35a46170926a4f7271 /etc/nagios-plugins/config/rpc-nfs.cfg
|
|
||||||
7f3e2d0f212d4edaa3ab11bfc90ee89c /etc/nagios-plugins/config/snmp.cfg
|
|
||||||
8d850a7b3410ea737ff280910c87b9ac /etc/nagios-plugins/config/ssh.cfg
|
|
||||||
6c73e9acd534ea6ebf56aac223b27183 /etc/nagios-plugins/config/tcp_udp.cfg
|
|
||||||
fe4d582cabee5943995630264e88cc92 /etc/nagios-plugins/config/telnet.cfg
|
|
||||||
eaa10e39dd4c8477d102534380ab5630 /etc/nagios-plugins/config/users.cfg
|
|
||||||
854ff23e363598435f0ea51e06219399 /etc/nagios-plugins/config/vsz.cfg
|
|
Loading…
Reference in a new issue