perfsonar development work

Author: gijs
Date: 2008-03-21 10:23:51 -0400 (Fri, 21 Mar 2008)
New Revision: 3544

Modified:
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/contrib/nfcapd.rc
Log:
moved more config stuff to service.properties



Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/contrib/nfcapd.rc
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/contrib/nfcapd.rc      
  2008-03-21 13:00:46 UTC (rev 3543)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/contrib/nfcapd.rc      
  2008-03-21 14:23:51 UTC (rev 3544)
@@ -11,43 +11,35 @@
 ### END INIT INFO
 
 ### BEGIN SCRIPT CONFIG
-
-# TODO: some of these should be in service.properties?
-
-# where is the service.properties file located
+#
+## where is the service.properties file located
 
#CONF=/home/perfsonar/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
 CONF=../../../service.properties
-
-# where is nfcapd installed
-NFCAPD=/usr/bin/nfcapd
-
-# where to store pid files
+#
+## where to store pid files
 #PIDFOLDER=/home/perfsonar/webapps/surfnet_java-flowsa/WEB-INF/contrib/run
 PIDFOLDER=./run
-
-# should run as user (leave empty if you are happy with current UID)
-#USER=tomcat
-USER=
-
-# should run as group
-#GROUP=tomcat
-GROUP=
-
+#
 ### END SCRIPT CONFIG
 
-
 if [[ ! -f $CONF ]]; then
        echo "ERROR: service.properties location incorrect ($CONF)"
        exit 1;
 fi
 
-if [[ ! -f $NFCAPD ]]; then
+# get nfcapd location
+NFCAPD=`grep ^service\.ma\.flowsa\.nfcapd\.location $CONF | cut -f 2 -d =`
+if [[ ! -x $NFCAPD ]]; then
        echo "ERROR: nfcapd location incorrect ($NFCAPD)"
        exit 1;
 fi
 
+USER=`grep ^service\.ma\.flowsa\.nfcapd\.user $CONF | cut -f 2 -d =`
+GROUP=`grep ^service\.ma\.flowsa\.nfcapd\.group $CONF | cut -f 2 -d =`
+
 # get number of configured exporters && check if > 0
-EXPNUM=`grep ^service\.ma\.flowsa\.exporter.*\.hostname $CONF | wc -l`
+#EXPNUM=`grep ^service\.ma\.flowsa\.exporter.*\.hostname $CONF | wc -l`
+EXPNUM=`grep ^service\.ma\.flowsa\.exporters $CONF | cut -f 2 -d =`
 if [[ $EXPNUM == 0 ]]; then
        echo "ERROR: no exporters configured in $CONF"
        exit 1;