PR#202 run-time check and related issues

bind/bind.spec

@@ -235,17 +235,19 @@ Conflicts:    bind8
         ) | %{l_rpmtool} msg -b -t notice
         $RPM_INSTALL_PREFIX/sbin/rndc-confgen -a
         chown %{l_musr}:%{l_mgrp} $RPM_INSTALL_PREFIX/etc/bind/rndc.key
-    elif [ $1 -gt 1 ]; then
-        #   reload daemon
-        $RPM_INSTALL_PREFIX/sbin/rndc reload >/dev/null 2>&1 || true
     fi
 
+    #   after upgrade, restart service
+    [ $1 -eq 2 ] || exit 0
+    eval `%{l_rc} bind status 2>/dev/null`
+    [ ".$bind_active" = .yes ] && %{l_rc} bind restart
+    exit 0
+
 %preun
-    if [ $1 -eq 0 ]; then
+    #   before erase, stop service and remove log files
-        #   stop daemon
+    [ $1 -eq 0 ] || exit 0
-        $RPM_INSTALL_PREFIX/sbin/rndc stop >/dev/null 2>&1 || true
+    %{l_rc} bind stop 2>/dev/null
-        #   remove dynamically generated files
+    rm -f $RPM_INSTALL_PREFIX/etc/bind/rndc.key
-        rm -f $RPM_INSTALL_PREFIX/etc/bind/rndc.key
+    rm -f $RPM_INSTALL_PREFIX/var/bind/*
-        rm -f $RPM_INSTALL_PREFIX/var/bind/*
+    exit 0
-    fi
 

bind/named.conf

@@ -34,7 +34,7 @@ options {
     transfer-format      one-answer;
     cleaning-interval    60;
     interface-interval   60;
-    #listen-on           port 53 { 127.0.0.1; };
+    listen-on            port 53 { 127.0.0.1; };
     #query-source        address 127.0.0.1 port *;
     #transfer-source     127.0.0.1;
     #notify-source       127.0.0.1;

bind/rc.bind

@@ -6,8 +6,10 @@
 %config
     bind_enable="$openpkg_rc_def"
     bind_flags=""
-    bind_log_numfiles="5"
+    bind_log_prolog="true"
-    bind_log_minsize="512K"
+    bind_log_epilog="true"
+    bind_log_numfiles="10"
+    bind_log_minsize="1M"
     bind_log_complevel="9"
 
 %status -u @l_susr@ -o
@@ -21,27 +23,33 @@
 
 %start -p 100 -u @l_susr@
     rcService bind enable yes || exit 0
+    rcService bind active yes && exit 0
     @l_prefix@/sbin/named ${bind_flags}
 
 %stop -p 100 -u @l_susr@
     rcService bind enable yes || exit 0
+    rcService bind active no  && exit 0
     @l_prefix@/sbin/rndc stop
+    sleep 2
 
 %restart -p 100 -u @l_susr@
     rcService bind enable yes || exit 0
-    @l_prefix@/sbin/rndc stop
+    rcService bind active no  && exit 0
-    sleep 1
+    rc bind stop start
-    @l_prefix@/sbin/named ${bind_flags}
 
 %reload -p 100 -u @l_susr@
     rcService bind enable yes || exit 0
+    rcService bind active no  && exit 0
     @l_prefix@/sbin/rndc reload
 
 %daily -u @l_susr@
     rcService bind enable yes || exit 0
+
+    #   rotate logfile
     shtool rotate -f \
-        -n ${bind_log_numfiles} -s ${bind_log_minsize} \
+        -n ${bind_log_numfiles} -s ${bind_log_minsize} -d \
-        -d -z ${bind_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
+        -z ${bind_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-        -E '@l_prefix@/sbin/rndc reload' \
+        -P "${bind_log_prolog}" \
+        -E "${bind_log_epilog} && rc bind reload" \
         @l_prefix@/var/bind/named.log