- update paketa za Squeeze

- changelog.carnet brisanje
- update rulesa na novi format
- fixevi za bind9 squeeze monitor

diff --git a/README.CARNet b/README.CARNet
index b89deb6..3d7fd1f 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -35,4 +35,4 @@ Primijetite da je monit respawnable proces -- on ne starta kroz
 "padne" ili ga nehotice netko "ubije", on ce se automatski odmah pokrenuti
 nazad.
 
- -- Dinko Korunic <kreator@CARNet.hr>  Sat, 12 Sep 2009 00:01:41 +0200
+ -- Dinko Korunic <kreator@CARNet.hr>  Wed, 27 Apr 2011 18:45:06 +0200

diff --git a/changelog.CARNet b/changelog.CARNet
deleted file mode 120000 (symlink)
index 194579e..0000000
--- a/changelog.CARNet
+++ /dev/null
@@ -1 +0,0 @@
-changelog.Debian
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index 2e1478f..30e3790 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monit-cn (1:5.1.2) stable; urgency=low
+
+  * lintian fixevi
+  * #23264: monit-cn/squeeze: konfiguracija
+
+ -- Dinko Korunic <kreator@carnet.hr>  Wed, 27 Apr 2011 19:01:48 +0200
+
+monit-cn (1:5.1.1) stable; urgency=low
+
+  * update paketa za Squeeze
+  * fix za Squeeze inacicu bind9 templatea
+
+ -- Dinko Korunic <kreator@carnet.hr>  Tue, 26 Apr 2011 18:01:10 +0200
+
 monit-cn (1:4.10.1.4) stable; urgency=low
 
   * revert #11630 promjene s obzirom na opet promijenjeni path u Debian

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 68defe6..cf4a989 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: monit-cn
 Section: net
 Priority: optional
 Maintainer: Dinko Korunic <kreator@CARNet.hr>
-Build-Depends: debhelper (>= 4)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
 
 Package: monit-cn
 Architecture: all
-Depends: monit (>= 1:4.10.1-4), carnet-tools-cn (>= 2.8.1), gawk | mawk
+Depends: monit (>= 1:5.1.1-1), carnet-tools-cn (>= 2.8.1), gawk | mawk, ${misc:Depends}
 Description: A utility for monitoring and managing daemons or similar programs
  monit is a utility for monitoring and managing daemons or similar
  programs running on a Unix system. It will start specified programs

diff --git a/debian/docs b/debian/docs
index ef5ce6c..8f6e250 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-changelog.CARNet
 README.CARNet

diff --git a/debian/rules b/debian/rules
index ab981fb..cbe925d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,74 +1,3 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# This file is public domain software, originally written by Joey Hess.
-#
-# This version is for packages that are architecture independent.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-
-       # Add here commands to compile the package.
-       #$(MAKE)
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       # Add here commands to clean up after the build process.
-       #-$(MAKE) clean
-       #-$(MAKE) distclean
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the package into debian/<packagename>.
-       #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_install -X.svn
-#      dh_installexamples
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installcatalogs
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-#      dh_undocumented
-       dh_installman
-       dh_link
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_python
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh $@

diff --git a/monit-cn/bind9-lenny.conf b/monit-cn/bind9-lenny.conf
new file mode 100644 (file)
index 0000000..92e76f1
--- /dev/null
+++ b/monit-cn/bind9-lenny.conf
@@ -0,0 +1,14 @@
+## Begin - Generated by CARNet package monit-cn
+#
+#  This is a monit-cn template file.  REMOVE this whole comment block if
+#  you DON'T WANT monit-cn to edit/remove/delete your configuration file.
+#
+## End - Generated by CARNet package monit-cn
+
+check process bind with pidfile "/var/run/bind/run/named.pid"
+       start program = "/etc/init.d/bind9 start"
+       stop program = "/etc/init.d/bind9 stop"
+       if failed host 127.0.0.1 port 53 type tcp
+               then restart
+       if failed host 127.0.0.1 port 53 type udp
+               then restart

diff --git a/monit-cn/bind9.conf b/monit-cn/bind9.conf
index 92e76f1..1ad304d 100644 (file)
--- a/monit-cn/bind9.conf
+++ b/monit-cn/bind9.conf
@@ -5,7 +5,7 @@
 #
 ## End - Generated by CARNet package monit-cn
 
-check process bind with pidfile "/var/run/bind/run/named.pid"
+check process bind with pidfile "/var/run/named/named.pid"
        start program = "/etc/init.d/bind9 start"
        stop program = "/etc/init.d/bind9 stop"
        if failed host 127.0.0.1 port 53 type tcp