Bläddra i källkod

rename whois_filt config file, and extend rc.ripe-dbase.extobjs to give info on whois_filt

Michael Schloh von Bennewitz 21 år sedan
förälder
incheckning
2881d2ab91
3 ändrade filer med 14 tillägg och 4 borttagningar
  1. 12 2
      ripe-dbase/rc.ripe-dbase.extobjs
  2. 2 2
      ripe-dbase/ripe-dbase.spec
  3. 0 0
      ripe-dbase/whois_filt.config

+ 12 - 2
ripe-dbase/rc.ripe-dbase.extobjs

@@ -13,21 +13,31 @@
     ripe_dbase_log_complevel="9"
 
 %common
-    ripe_dbase_pidrip="@l_prefix@/var/ripe-dbase/whois_rip.pid"
-    ripe_dbase_pidfilt="@l_prefix@/var/ripe-dbase/whois_filt.pid"
+    ripe_dbase_pidfile="@l_prefix@/var/ripe-dbase/whois_rip.pid"
+    ripe_filter_pidfile="@l_prefix@/var/ripe-dbase/whois_filt.pid"
     ripe_dbase_cfgfile="@l_prefix@/etc/ripe-dbase/rip.config.sample"
     ripe_dbase_signal () {
         [ -f $ripe_dbase_pidfile ] && kill -$1 `cat $ripe_dbase_pidfile`
     }
+    ripe_filter_signal () {
+        [ -f $ripe_filter_pidfile ] && kill -$1 `cat $ripe_filter_pidfile`
+    }
 
 %status -u @l_susr@ -o
     ripe_dbase_usable="unknown"
     ripe_dbase_active="no"
+    ripe_filter_usable="unknown"
+    ripe_filter_active="no"
     rcService ripe-dbase enable yes && \
         ripe_dbase_signal 0 && ripe_dbase_active="yes"
+    rcService ripe-filter enable yes && \
+        ripe_filter_signal 0 && ripe_filter_active="yes"
     echo "ripe_dbase_enable=\"$ripe_dbase_enable\""
     echo "ripe_dbase_usable=\"$ripe_dbase_usable\""
     echo "ripe_dbase_active=\"$ripe_dbase_active\""
+    echo "ripe_filter_enable=\"$ripe_filter_enable\""
+    echo "ripe_filter_usable=\"$ripe_filter_usable\""
+    echo "ripe_filter_active=\"$ripe_filter_active\""
 
 %start -u @l_susr@
     #   main server

+ 2 - 2
ripe-dbase/ripe-dbase.spec

@@ -46,7 +46,7 @@ Source2:      ripe-dbase-modify.sh
 Source3:      rc.ripe-dbase
 Source4:      rc.ripe-dbase.extobjs
 Source5:      whois_filt.pl
-Source6:      whois_filt.conf
+Source6:      whois_filt.config
 Patch0:       ripe-dbase.patch
 Patch1:       ripe-dbase.patch.extobjs
 
@@ -155,7 +155,7 @@ AutoReqProv:  no
         %{SOURCE whois_filt.pl} \
         $RPM_BUILD_ROOT%{l_prefix}/bin/whois_filt
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
-        %{SOURCE whois_filt.conf} \
+        %{SOURCE whois_filt.config} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/ripe-dbase/
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.ripe-dbase.extobjs} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/

ripe-dbase/whois_filt.conf → ripe-dbase/whois_filt.config