From c52cf8d1190f744101fe52aa0e66c299b6bc0014 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 31 Mar 2009 19:10:19 +0200 Subject: [PATCH] Move stuff around --- Makefile | 50 ------------------- build-nagios => config/build-nagios | 0 checkcommands.cfg => config/checkcommands.cfg | 0 .../nagios-conf}/contacs.cfg | 0 .../nagios-conf}/generic-host.cfg | 0 .../nagios-conf}/generic-service.cfg | 0 .../nagios-conf}/timeperiods.cfg | 0 nagios-master.cfg => config/nagios-master.cfg | 0 .../apt-status-check | 0 .../debian/README.Debian | 0 .../debian/changelog | 0 .../debian/compat | 0 .../debian/control | 0 .../debian/copyright | 0 .../debian/cron.d | 0 .../debian/dirs | 0 .../debian/postinst | 0 .../debian/postrm | 0 .../debian/rules | 0 .../dsa-check-config | 0 .../dsa-check-dabackup | 0 .../dsa-check-dabackup-server | 0 .../dsa-check-hpacucli | 0 .../dsa-check-mirrorsync | 0 .../dsa-check-packages | 0 .../dsa-check-puppet | 0 .../dsa-check-raid-3ware | 0 .../dsa-check-raid-areca | 0 .../dsa-check-raid-dac960 | 0 .../dsa-check-raid-mpt | 0 .../dsa-check-raid-sw | 0 .../dsa-check-running-kernel | 0 .../dsa-check-samhain | 0 .../dsa-check-soas | 0 .../dsa-check-statusfile | 0 .../dsa-check-udldap-freshness | 0 .../dsa-update-apt-status | 0 .../dsa-update-samhain-status | 0 .../obsolete-packages-ignore | 0 .../weak-ssh-keys-check | 0 40 files changed, 50 deletions(-) delete mode 100644 Makefile rename build-nagios => config/build-nagios (100%) rename checkcommands.cfg => config/checkcommands.cfg (100%) rename {nagios-conf => config/nagios-conf}/contacs.cfg (100%) rename {nagios-conf => config/nagios-conf}/generic-host.cfg (100%) rename {nagios-conf => config/nagios-conf}/generic-service.cfg (100%) rename {nagios-conf => config/nagios-conf}/timeperiods.cfg (100%) rename nagios-master.cfg => config/nagios-master.cfg (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/apt-status-check (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/README.Debian (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/changelog (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/compat (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/control (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/copyright (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/cron.d (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/dirs (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/postinst (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/postrm (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/debian/rules (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-config (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-dabackup (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-dabackup-server (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-hpacucli (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-mirrorsync (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-packages (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-puppet (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-raid-3ware (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-raid-areca (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-raid-dac960 (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-raid-mpt (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-raid-sw (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-running-kernel (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-samhain (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-soas (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-statusfile (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-check-udldap-freshness (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-update-apt-status (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/dsa-update-samhain-status (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/obsolete-packages-ignore (100%) rename {dsa-nagios-nrpe-config => dsa-nagios-checks}/weak-ssh-keys-check (100%) diff --git a/Makefile b/Makefile deleted file mode 100644 index 5b78018..0000000 --- a/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -all: generated/nrpe_dsa.cfg deb - -generated/nrpe_dsa.cfg: nagios-master.cfg build-nagios - [ -d generated ] || mkdir generated - ./build-nagios - - -deb: generated/nrpe_dsa.cfg dsa-nagios-nrpe-config/debian/changelog - if ! [ -e Build-tree/dsa-nagios-nrpe-config/nrpe_dsa.cfg ] || \ - ! diff generated/nrpe_dsa.cfg Build-tree/dsa-nagios-nrpe-config/nrpe_dsa.cfg > /dev/null; then \ - cp -a generated/nrpe_dsa.cfg dsa-nagios-nrpe-config && \ - rm -rf Build-tree && \ - mkdir Build-tree && \ - cp -av dsa-nagios-nrpe-config Build-tree && \ - cd Build-tree/dsa-nagios-nrpe-config && \ - dch --newversion "$$(date --utc '+%Y%m%dT%H%M%S')" "Built on `hostname` in `pwd` by $$USER." && \ - debuild -rfakeroot -uc -us; \ - fi - -clean: - rm -rf generated - rm -rf Build-tree - rm -f dsa-nagios-nrpe-config/nrpe_dsa.cfg - -install: generated/nrpe_dsa.cfg - dh_testroot - # - install -m 644 checkcommands.cfg /etc/nagios-plugins/config/local-dsa-checkcommands.cfg - # - install -m 644 nagios-conf/contacs.cfg /etc/nagios3/conf.d - install -m 644 nagios-conf/generic-host.cfg /etc/nagios3/conf.d - install -m 644 nagios-conf/generic-service.cfg /etc/nagios3/conf.d - install -m 644 nagios-conf/timeperiods.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-dependencies.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-hostextinfo.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-hostgroups.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-hosts.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-serviceextinfo.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-services.cfg /etc/nagios3/conf.d - install -m 644 generated/auto-servicegroups.cfg /etc/nagios3/conf.d - # - @echo "Also run: " - @echo " cp Build-tree/*.deb /org/db.debian.org/ftp-archive/archive/pool/etch/ && " - @echo " make -C /org/db.debian.org/ftp-archive" - # - @echo - # - env -i /etc/init.d/nagios3 reload - -.PHONY: all deb diff --git a/build-nagios b/config/build-nagios similarity index 100% rename from build-nagios rename to config/build-nagios diff --git a/checkcommands.cfg b/config/checkcommands.cfg similarity index 100% rename from checkcommands.cfg rename to config/checkcommands.cfg diff --git a/nagios-conf/contacs.cfg b/config/nagios-conf/contacs.cfg similarity index 100% rename from nagios-conf/contacs.cfg rename to config/nagios-conf/contacs.cfg diff --git a/nagios-conf/generic-host.cfg b/config/nagios-conf/generic-host.cfg similarity index 100% rename from nagios-conf/generic-host.cfg rename to config/nagios-conf/generic-host.cfg diff --git a/nagios-conf/generic-service.cfg b/config/nagios-conf/generic-service.cfg similarity index 100% rename from nagios-conf/generic-service.cfg rename to config/nagios-conf/generic-service.cfg diff --git a/nagios-conf/timeperiods.cfg b/config/nagios-conf/timeperiods.cfg similarity index 100% rename from nagios-conf/timeperiods.cfg rename to config/nagios-conf/timeperiods.cfg diff --git a/nagios-master.cfg b/config/nagios-master.cfg similarity index 100% rename from nagios-master.cfg rename to config/nagios-master.cfg diff --git a/dsa-nagios-nrpe-config/apt-status-check b/dsa-nagios-checks/apt-status-check similarity index 100% rename from dsa-nagios-nrpe-config/apt-status-check rename to dsa-nagios-checks/apt-status-check diff --git a/dsa-nagios-nrpe-config/debian/README.Debian b/dsa-nagios-checks/debian/README.Debian similarity index 100% rename from dsa-nagios-nrpe-config/debian/README.Debian rename to dsa-nagios-checks/debian/README.Debian diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-checks/debian/changelog similarity index 100% rename from dsa-nagios-nrpe-config/debian/changelog rename to dsa-nagios-checks/debian/changelog diff --git a/dsa-nagios-nrpe-config/debian/compat b/dsa-nagios-checks/debian/compat similarity index 100% rename from dsa-nagios-nrpe-config/debian/compat rename to dsa-nagios-checks/debian/compat diff --git a/dsa-nagios-nrpe-config/debian/control b/dsa-nagios-checks/debian/control similarity index 100% rename from dsa-nagios-nrpe-config/debian/control rename to dsa-nagios-checks/debian/control diff --git a/dsa-nagios-nrpe-config/debian/copyright b/dsa-nagios-checks/debian/copyright similarity index 100% rename from dsa-nagios-nrpe-config/debian/copyright rename to dsa-nagios-checks/debian/copyright diff --git a/dsa-nagios-nrpe-config/debian/cron.d b/dsa-nagios-checks/debian/cron.d similarity index 100% rename from dsa-nagios-nrpe-config/debian/cron.d rename to dsa-nagios-checks/debian/cron.d diff --git a/dsa-nagios-nrpe-config/debian/dirs b/dsa-nagios-checks/debian/dirs similarity index 100% rename from dsa-nagios-nrpe-config/debian/dirs rename to dsa-nagios-checks/debian/dirs diff --git a/dsa-nagios-nrpe-config/debian/postinst b/dsa-nagios-checks/debian/postinst similarity index 100% rename from dsa-nagios-nrpe-config/debian/postinst rename to dsa-nagios-checks/debian/postinst diff --git a/dsa-nagios-nrpe-config/debian/postrm b/dsa-nagios-checks/debian/postrm similarity index 100% rename from dsa-nagios-nrpe-config/debian/postrm rename to dsa-nagios-checks/debian/postrm diff --git a/dsa-nagios-nrpe-config/debian/rules b/dsa-nagios-checks/debian/rules similarity index 100% rename from dsa-nagios-nrpe-config/debian/rules rename to dsa-nagios-checks/debian/rules diff --git a/dsa-nagios-nrpe-config/dsa-check-config b/dsa-nagios-checks/dsa-check-config similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-config rename to dsa-nagios-checks/dsa-check-config diff --git a/dsa-nagios-nrpe-config/dsa-check-dabackup b/dsa-nagios-checks/dsa-check-dabackup similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-dabackup rename to dsa-nagios-checks/dsa-check-dabackup diff --git a/dsa-nagios-nrpe-config/dsa-check-dabackup-server b/dsa-nagios-checks/dsa-check-dabackup-server similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-dabackup-server rename to dsa-nagios-checks/dsa-check-dabackup-server diff --git a/dsa-nagios-nrpe-config/dsa-check-hpacucli b/dsa-nagios-checks/dsa-check-hpacucli similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-hpacucli rename to dsa-nagios-checks/dsa-check-hpacucli diff --git a/dsa-nagios-nrpe-config/dsa-check-mirrorsync b/dsa-nagios-checks/dsa-check-mirrorsync similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-mirrorsync rename to dsa-nagios-checks/dsa-check-mirrorsync diff --git a/dsa-nagios-nrpe-config/dsa-check-packages b/dsa-nagios-checks/dsa-check-packages similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-packages rename to dsa-nagios-checks/dsa-check-packages diff --git a/dsa-nagios-nrpe-config/dsa-check-puppet b/dsa-nagios-checks/dsa-check-puppet similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-puppet rename to dsa-nagios-checks/dsa-check-puppet diff --git a/dsa-nagios-nrpe-config/dsa-check-raid-3ware b/dsa-nagios-checks/dsa-check-raid-3ware similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-raid-3ware rename to dsa-nagios-checks/dsa-check-raid-3ware diff --git a/dsa-nagios-nrpe-config/dsa-check-raid-areca b/dsa-nagios-checks/dsa-check-raid-areca similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-raid-areca rename to dsa-nagios-checks/dsa-check-raid-areca diff --git a/dsa-nagios-nrpe-config/dsa-check-raid-dac960 b/dsa-nagios-checks/dsa-check-raid-dac960 similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-raid-dac960 rename to dsa-nagios-checks/dsa-check-raid-dac960 diff --git a/dsa-nagios-nrpe-config/dsa-check-raid-mpt b/dsa-nagios-checks/dsa-check-raid-mpt similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-raid-mpt rename to dsa-nagios-checks/dsa-check-raid-mpt diff --git a/dsa-nagios-nrpe-config/dsa-check-raid-sw b/dsa-nagios-checks/dsa-check-raid-sw similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-raid-sw rename to dsa-nagios-checks/dsa-check-raid-sw diff --git a/dsa-nagios-nrpe-config/dsa-check-running-kernel b/dsa-nagios-checks/dsa-check-running-kernel similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-running-kernel rename to dsa-nagios-checks/dsa-check-running-kernel diff --git a/dsa-nagios-nrpe-config/dsa-check-samhain b/dsa-nagios-checks/dsa-check-samhain similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-samhain rename to dsa-nagios-checks/dsa-check-samhain diff --git a/dsa-nagios-nrpe-config/dsa-check-soas b/dsa-nagios-checks/dsa-check-soas similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-soas rename to dsa-nagios-checks/dsa-check-soas diff --git a/dsa-nagios-nrpe-config/dsa-check-statusfile b/dsa-nagios-checks/dsa-check-statusfile similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-statusfile rename to dsa-nagios-checks/dsa-check-statusfile diff --git a/dsa-nagios-nrpe-config/dsa-check-udldap-freshness b/dsa-nagios-checks/dsa-check-udldap-freshness similarity index 100% rename from dsa-nagios-nrpe-config/dsa-check-udldap-freshness rename to dsa-nagios-checks/dsa-check-udldap-freshness diff --git a/dsa-nagios-nrpe-config/dsa-update-apt-status b/dsa-nagios-checks/dsa-update-apt-status similarity index 100% rename from dsa-nagios-nrpe-config/dsa-update-apt-status rename to dsa-nagios-checks/dsa-update-apt-status diff --git a/dsa-nagios-nrpe-config/dsa-update-samhain-status b/dsa-nagios-checks/dsa-update-samhain-status similarity index 100% rename from dsa-nagios-nrpe-config/dsa-update-samhain-status rename to dsa-nagios-checks/dsa-update-samhain-status diff --git a/dsa-nagios-nrpe-config/obsolete-packages-ignore b/dsa-nagios-checks/obsolete-packages-ignore similarity index 100% rename from dsa-nagios-nrpe-config/obsolete-packages-ignore rename to dsa-nagios-checks/obsolete-packages-ignore diff --git a/dsa-nagios-nrpe-config/weak-ssh-keys-check b/dsa-nagios-checks/weak-ssh-keys-check similarity index 100% rename from dsa-nagios-nrpe-config/weak-ssh-keys-check rename to dsa-nagios-checks/weak-ssh-keys-check -- 2.20.1