From 42e99da9d896a33803e763c746e9a103183b6b34 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 31 Mar 2009 19:19:40 +0200 Subject: [PATCH] Move files into specific directories in source --- .../{ => checks}/dsa-check-config | 0 .../{ => checks}/dsa-check-dabackup | 0 .../{ => checks}/dsa-check-dabackup-server | 0 .../{ => checks}/dsa-check-hpacucli | 0 .../{ => checks}/dsa-check-mirrorsync | 0 .../{ => checks}/dsa-check-packages | 0 .../{ => checks}/dsa-check-puppet | 0 .../{ => checks}/dsa-check-raid-3ware | 0 .../{ => checks}/dsa-check-raid-areca | 0 .../{ => checks}/dsa-check-raid-dac960 | 0 .../{ => checks}/dsa-check-raid-mpt | 0 .../{ => checks}/dsa-check-raid-sw | 0 .../{ => checks}/dsa-check-running-kernel | 0 .../{ => checks}/dsa-check-samhain | 0 dsa-nagios-checks/{ => checks}/dsa-check-soas | 0 .../{ => checks}/dsa-check-statusfile | 0 .../{ => checks}/dsa-check-udldap-freshness | 0 dsa-nagios-checks/debian/changelog | 3 +- dsa-nagios-checks/debian/rules | 40 +++++++------------ .../{ => etc}/obsolete-packages-ignore | 0 .../{ => sbin}/dsa-update-apt-status | 0 .../{ => sbin}/dsa-update-samhain-status | 0 .../{ => share}/apt-status-check | 0 .../{ => share}/weak-ssh-keys-check | 0 24 files changed, 17 insertions(+), 26 deletions(-) rename dsa-nagios-checks/{ => checks}/dsa-check-config (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-dabackup (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-dabackup-server (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-hpacucli (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-mirrorsync (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-packages (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-puppet (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-raid-3ware (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-raid-areca (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-raid-dac960 (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-raid-mpt (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-raid-sw (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-running-kernel (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-samhain (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-soas (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-statusfile (100%) rename dsa-nagios-checks/{ => checks}/dsa-check-udldap-freshness (100%) rename dsa-nagios-checks/{ => etc}/obsolete-packages-ignore (100%) rename dsa-nagios-checks/{ => sbin}/dsa-update-apt-status (100%) rename dsa-nagios-checks/{ => sbin}/dsa-update-samhain-status (100%) rename dsa-nagios-checks/{ => share}/apt-status-check (100%) rename dsa-nagios-checks/{ => share}/weak-ssh-keys-check (100%) diff --git a/dsa-nagios-checks/dsa-check-config b/dsa-nagios-checks/checks/dsa-check-config similarity index 100% rename from dsa-nagios-checks/dsa-check-config rename to dsa-nagios-checks/checks/dsa-check-config diff --git a/dsa-nagios-checks/dsa-check-dabackup b/dsa-nagios-checks/checks/dsa-check-dabackup similarity index 100% rename from dsa-nagios-checks/dsa-check-dabackup rename to dsa-nagios-checks/checks/dsa-check-dabackup diff --git a/dsa-nagios-checks/dsa-check-dabackup-server b/dsa-nagios-checks/checks/dsa-check-dabackup-server similarity index 100% rename from dsa-nagios-checks/dsa-check-dabackup-server rename to dsa-nagios-checks/checks/dsa-check-dabackup-server diff --git a/dsa-nagios-checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli similarity index 100% rename from dsa-nagios-checks/dsa-check-hpacucli rename to dsa-nagios-checks/checks/dsa-check-hpacucli diff --git a/dsa-nagios-checks/dsa-check-mirrorsync b/dsa-nagios-checks/checks/dsa-check-mirrorsync similarity index 100% rename from dsa-nagios-checks/dsa-check-mirrorsync rename to dsa-nagios-checks/checks/dsa-check-mirrorsync diff --git a/dsa-nagios-checks/dsa-check-packages b/dsa-nagios-checks/checks/dsa-check-packages similarity index 100% rename from dsa-nagios-checks/dsa-check-packages rename to dsa-nagios-checks/checks/dsa-check-packages diff --git a/dsa-nagios-checks/dsa-check-puppet b/dsa-nagios-checks/checks/dsa-check-puppet similarity index 100% rename from dsa-nagios-checks/dsa-check-puppet rename to dsa-nagios-checks/checks/dsa-check-puppet diff --git a/dsa-nagios-checks/dsa-check-raid-3ware b/dsa-nagios-checks/checks/dsa-check-raid-3ware similarity index 100% rename from dsa-nagios-checks/dsa-check-raid-3ware rename to dsa-nagios-checks/checks/dsa-check-raid-3ware diff --git a/dsa-nagios-checks/dsa-check-raid-areca b/dsa-nagios-checks/checks/dsa-check-raid-areca similarity index 100% rename from dsa-nagios-checks/dsa-check-raid-areca rename to dsa-nagios-checks/checks/dsa-check-raid-areca diff --git a/dsa-nagios-checks/dsa-check-raid-dac960 b/dsa-nagios-checks/checks/dsa-check-raid-dac960 similarity index 100% rename from dsa-nagios-checks/dsa-check-raid-dac960 rename to dsa-nagios-checks/checks/dsa-check-raid-dac960 diff --git a/dsa-nagios-checks/dsa-check-raid-mpt b/dsa-nagios-checks/checks/dsa-check-raid-mpt similarity index 100% rename from dsa-nagios-checks/dsa-check-raid-mpt rename to dsa-nagios-checks/checks/dsa-check-raid-mpt diff --git a/dsa-nagios-checks/dsa-check-raid-sw b/dsa-nagios-checks/checks/dsa-check-raid-sw similarity index 100% rename from dsa-nagios-checks/dsa-check-raid-sw rename to dsa-nagios-checks/checks/dsa-check-raid-sw diff --git a/dsa-nagios-checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel similarity index 100% rename from dsa-nagios-checks/dsa-check-running-kernel rename to dsa-nagios-checks/checks/dsa-check-running-kernel diff --git a/dsa-nagios-checks/dsa-check-samhain b/dsa-nagios-checks/checks/dsa-check-samhain similarity index 100% rename from dsa-nagios-checks/dsa-check-samhain rename to dsa-nagios-checks/checks/dsa-check-samhain diff --git a/dsa-nagios-checks/dsa-check-soas b/dsa-nagios-checks/checks/dsa-check-soas similarity index 100% rename from dsa-nagios-checks/dsa-check-soas rename to dsa-nagios-checks/checks/dsa-check-soas diff --git a/dsa-nagios-checks/dsa-check-statusfile b/dsa-nagios-checks/checks/dsa-check-statusfile similarity index 100% rename from dsa-nagios-checks/dsa-check-statusfile rename to dsa-nagios-checks/checks/dsa-check-statusfile diff --git a/dsa-nagios-checks/dsa-check-udldap-freshness b/dsa-nagios-checks/checks/dsa-check-udldap-freshness similarity index 100% rename from dsa-nagios-checks/dsa-check-udldap-freshness rename to dsa-nagios-checks/checks/dsa-check-udldap-freshness diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index 0bcbd06..e252ca0 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -4,8 +4,9 @@ dsa-nagios-checks (69) unstable; urgency=low * Replaces/Conflicts dsa-nagios-nrpe-config. * Update description. * No longer install nrpe_dsa.cfg. + * Move files into specific directories in source. - -- Peter Palfrader Tue, 31 Mar 2009 19:15:45 +0200 + -- Peter Palfrader Tue, 31 Mar 2009 19:19:14 +0200 dsa-nagios-nrpe-config (68) unstable; urgency=low diff --git a/dsa-nagios-checks/debian/rules b/dsa-nagios-checks/debian/rules index 269aa3a..179ed1d 100755 --- a/dsa-nagios-checks/debian/rules +++ b/dsa-nagios-checks/debian/rules @@ -13,31 +13,21 @@ install: dh_clean -k dh_installdirs - install -m 755 dsa-check-hpacucli $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-raid-areca $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-raid-dac960 $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-raid-mpt $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-raid-sw $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-raid-3ware $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-running-kernel $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-config $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-dabackup $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-dabackup-server $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-udldap-freshness $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-statusfile $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-samhain $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-mirrorsync $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-soas $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - - install -m 755 dsa-check-puppet $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 755 dsa-check-packages $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins - install -m 644 obsolete-packages-ignore $(CURDIR)/debian/dsa-nagios-nrpe-config/etc/nagios - - install -m 755 apt-status-check $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/share/dsa - install -m 755 weak-ssh-keys-check $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/share/dsa - - install -m 755 dsa-update-apt-status $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/sbin - install -m 755 dsa-update-samhain-status $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/sbin + for f in `ls -1 checks/*`; do \ + install -m 755 $$f $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/lib/nagios/plugins; \ + done + + for f in `ls -1 etc/*`; do \ + install -m 644 $$f $(CURDIR)/debian/dsa-nagios-nrpe-config/etc/nagios; \ + done + + for f in `ls -1 share/*`; do \ + install -m 755 $$f $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/share/dsa; \ + done + + for f in `ls -1 sbin/*`; do \ + install -m 755 $$f $(CURDIR)/debian/dsa-nagios-nrpe-config/usr/sbin; \ + done binary-indep: install diff --git a/dsa-nagios-checks/obsolete-packages-ignore b/dsa-nagios-checks/etc/obsolete-packages-ignore similarity index 100% rename from dsa-nagios-checks/obsolete-packages-ignore rename to dsa-nagios-checks/etc/obsolete-packages-ignore diff --git a/dsa-nagios-checks/dsa-update-apt-status b/dsa-nagios-checks/sbin/dsa-update-apt-status similarity index 100% rename from dsa-nagios-checks/dsa-update-apt-status rename to dsa-nagios-checks/sbin/dsa-update-apt-status diff --git a/dsa-nagios-checks/dsa-update-samhain-status b/dsa-nagios-checks/sbin/dsa-update-samhain-status similarity index 100% rename from dsa-nagios-checks/dsa-update-samhain-status rename to dsa-nagios-checks/sbin/dsa-update-samhain-status diff --git a/dsa-nagios-checks/apt-status-check b/dsa-nagios-checks/share/apt-status-check similarity index 100% rename from dsa-nagios-checks/apt-status-check rename to dsa-nagios-checks/share/apt-status-check diff --git a/dsa-nagios-checks/weak-ssh-keys-check b/dsa-nagios-checks/share/weak-ssh-keys-check similarity index 100% rename from dsa-nagios-checks/weak-ssh-keys-check rename to dsa-nagios-checks/share/weak-ssh-keys-check -- 2.20.1