X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ca7f6bf521cb35de1d8c2ae9df36f2d811d9143a;hb=HEAD;hp=567dedf913b85f5c9a41b079c3dde4331d2498f5;hpb=17c32ff7c315038d9b0118f6c314c397196a9050;p=bind9-cn.git

diff --git a/debian/postinst b/debian/postinst
index 567dedf..ca7f6bf 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,37 +1,15 @@
 #!/bin/sh
-# postinst script for bind9-cn
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure|reconfigure)
-      # continue below
-    ;;
-
-    *)
-        exit 0
-    ;;
-esac
-
-# import CN-functions
+[ "$1" = "configure" ] || exit 0
+[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
+
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 echo "CN: Making sample configurations in /usr/share/doc/bind9-cn/examples"
-echo "CN: Make sure you read them and apply *before* running Bind9 service!"
+echo "CN: Make sure you change them appropriately *before* running bind9 service!"
 
 #variables
 cp_get_ifaddr
@@ -44,6 +22,8 @@ CARNET_REV=`echo $CARNET_IPADDR | awk -F. '{ print $3 "." $2 "." $1 ".in-addr.ar
 SERNO=`date +%Y%m%d01`
 BROJ=`echo $CARNET_IPADDR | cut -d. -f4`
 
+echo "CN: Generating bind9 examples in /usr/share/doc/bind9-cn/examples"
+
 # make example named.conf.local
 cat > /usr/share/doc/bind9-cn/examples/named.conf.local <<EOF
 zone "$CARNET_DOMAINNAME" in {
@@ -73,7 +53,6 @@ acl "trusted" {
 
 options {
     directory "/etc/bind";
-    query-source address * port 53;
     auth-nxdomain no;
     allow-transfer { xfer; };
     allow-recursion { trusted; };
@@ -131,7 +110,6 @@ cat > /usr/share/doc/bind9-cn/examples/hosts.rev <<EOF
     NS  $CARNET_HOSTNAME.$CARNET_DOMAINNAME.
     NS  bjesomar.srce.hr.
 
-1   PTR localhost.$CARNET_DOMAINNAME.
 $BROJ   PTR   $CARNET_HOSTNAME.$CARNET_DOMAINNAME.
 EOF
 
@@ -146,21 +124,45 @@ EOF
 cat > /usr/share/doc/bind9-cn/examples/resolv.conf <<EOF
 search $CARNET_DOMAINNAME
 nameserver 127.0.0.1
-nameserver 161.53.2.70
+nameserver 161.53.123.3
+nameserver 161.53.160.3
 EOF
 
 # check if named.conf has lame server logging
-if [ -e /etc/bind/named.conf.options ]; then
-  lameconf=$(awk '/^logging/,/^}/ { if ($0 ~ /category lame-servers/) { print "yes"; exit } }' /etc/bind/named.conf)
-  if [ "x$lameconf" != "xyes" ]; then
-    cp /etc/bind/named.conf.options /etc/bind/named.conf.options.$$
-    cp-update bind9-cn /etc/bind/named.conf.options.$$ <<EOF
+script='/^logging/,/^}/ { if ($0 ~ /category lame-servers/) { print "yes"; exit } }'
+lameconf=
+if [ -e /etc/bind/named.conf.options -a -e /etc/bind/named.conf ]; then
+  lameconf=$(cat /etc/bind/named.conf /etc/bind/named.conf.options | awk "$script")
+else
+    if [ -e /etc/bind/named.conf ]; then
+      lameconf=$(awk "$script" /etc/bind/named.conf)
+    fi
+fi
+if [ "x$lameconf" != "xyes" ]; then
+  if [ ! -e /etc/bind/named.conf.options ]; then
+    touch /etc/bind/named.conf.options
+  fi
+  cp /etc/bind/named.conf.options /etc/bind/named.conf.options.$$
+  cp-update bind9-cn /etc/bind/named.conf.options.$$ <<EOF
 logging {
     category lame-servers { null; };
 };
 EOF
+  cp_mv /etc/bind/named.conf.options.$$ /etc/bind/named.conf.options
+    
+  # reload
+  echo "CN: Added lame-servers logging exclusion to named.conf.options"
+  rndc reload || echo "CN: Reload didn't work, please check manually"
+fi
+
+if [ -e /etc/bind/named.conf.options ] && \
+    fgrep -q 'query-source address * port 53' \
+        /etc/bind/named.conf.options; then
+        fgrep -v 'query-source address * port 53' \
+            /etc/bind/named.conf.options > /etc/bind/named.conf.options.$$
     cp_mv /etc/bind/named.conf.options.$$ /etc/bind/named.conf.options
-  fi
+    echo "CN: Removing obsolete query-source directive"
+    rndc reload || echo "CN: Reload didn't work, please check manually"
 fi
 
 # dh_installdeb will replace this with shell code automatically