X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=7eee7e4ebcfaf60140eca53f3030d6b3c22db2e2;hb=28c58b9acc0fd87f2d2439456557f0e24dcfe0a0;hp=d5f2e77217a67807a3e30e9f09f558911a8046a6;hpb=18584c660c54af3b2c3821e0059f023006a53151;p=bind9-cn.git

diff --git a/debian/postinst b/debian/postinst
index d5f2e77..7eee7e4 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,7 +31,7 @@ esac
 . /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
@@ -73,7 +73,6 @@ acl "trusted" {
 
 options {
     directory "/etc/bind";
-    query-source address * port 53;
     auth-nxdomain no;
     allow-transfer { xfer; };
     allow-recursion { trusted; };
@@ -131,7 +130,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
 
@@ -153,10 +151,10 @@ 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)
+  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)
+      lameconf=$(awk "$script" /etc/bind/named.conf)
     fi
 fi
 if [ "x$lameconf" != "xyes" ]; then
@@ -176,6 +174,16 @@ EOF
   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
+    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
 # generated by other debhelper scripts.