perfsonar development work

Author: gijs
Date: 2008-05-27 10:33:18 -0400 (Tue, 27 May 2008)
New Revision: 3880

Modified:
   trunk/packaging/deb/surfnet_java-flowsa-ma/changelog
   trunk/packaging/deb/surfnet_java-flowsa-ma/conffiles
   trunk/packaging/deb/surfnet_java-flowsa-ma/default
   trunk/packaging/deb/surfnet_java-flowsa-ma/dirs
   trunk/packaging/deb/surfnet_java-flowsa-ma/init
   trunk/packaging/deb/surfnet_java-flowsa-ma/install
   trunk/packaging/deb/surfnet_java-flowsa-ma/postinst
   trunk/packaging/deb/surfnet_java-flowsa-ma/postrm
Log:


Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/changelog
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/changelog        2008-05-27 
14:32:58 UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/changelog        2008-05-27 
14:33:18 UTC (rev 3880)
@@ -1,3 +1,10 @@
+surfnet-java-flowsa-ma (0.2-5) unstable; urgency=low
+
+  * changed init script to check default file, so service doesn't autostart
+  * changed _ to - in servicename everywhere
+
+ -- Gijs Molenaar 
<>
  Tue, 27 May 2008 16:07:22 +0200
+
 surfnet-java-flowsa-ma (0.2-4) unstable; urgency=low
 
   * testing update mechanism

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/conffiles
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/conffiles        2008-05-27 
14:32:58 UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/conffiles        2008-05-27 
14:33:18 UTC (rev 3880)
@@ -1,5 +1,5 @@
-/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/components.properties
-/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
-/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
+/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/WEB-INF/classes/perfsonar/conf/components.properties
+/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
+/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
+/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/WEB-INF/classes/perfsonar/conf/wizard.properties

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/default
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/default  2008-05-27 14:32:58 
UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/default  2008-05-27 14:33:18 
UTC (rev 3880)
@@ -8,3 +8,6 @@
 
 # Additional options that are passed to the Daemon.
 DAEMON_OPTS=""
+
+# Start flowsa-ma at startup
+FLOWSA_ENABLE=false

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/dirs
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/dirs     2008-05-27 14:32:58 
UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/dirs     2008-05-27 14:33:18 
UTC (rev 3880)
@@ -1,5 +1,5 @@
-/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma
-/etc/surfnet_java-flowsa-ma
-/var/run/surfnet_java-flowsa-ma
-/var/lib/surfnet_java-flowsa-ma
+/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma
+/etc/surfnet-java-flowsa-ma
+/var/run/surfnet-java-flowsa-ma
+/var/lib/surfnet-java-flowsa-ma
 

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/init
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/init     2008-05-27 14:32:58 
UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/init     2008-05-27 14:33:18 
UTC (rev 3880)
@@ -13,18 +13,28 @@
 ### END INIT INFO
 
 ## where is the service.properties file located
-CONF=/etc/surfnet_java-flowsa-ma/service.properties
+CONF=/etc/surfnet-java-flowsa-ma/service.properties
 
 # source lsb function library
 . /lib/lsb/init-functions
 . /etc/default/rcS
 
+FLOWSA_ENABLE=false
 # pull in sysconfig settings
-if [ -f /etc/sysconfig/surfnet_java-flowsa-ma ] ; then
-    . /etc/sysconfig/surfnet_java-flowsa-ma
+if [ -f /etc/default/surfnet-java-flowsa-ma ] ; then
+    . /etc/default/surfnet-java-flowsa-ma
 fi
 
+case $FLOWSA_ENABLE in
+    false)  exit 0
+            ;;
+    true)   ;;
+    *)      log_failure_msg "Value of FLOWSA_ENABLE should be true or false"
+            exit 1
+            ;;
+esac
 
+
 if [ ! -f $CONF ]; then
        log_failure_msg "service.properties location incorrect ($CONF)"
        exit 1;

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/install
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/install  2008-05-27 14:32:58 
UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/install  2008-05-27 14:33:18 
UTC (rev 3880)
@@ -1 +1 @@
-build/flowsama/* /var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma
+build/flowsama/* /var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/postinst
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/postinst 2008-05-27 14:32:58 
UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/postinst 2008-05-27 14:33:18 
UTC (rev 3880)
@@ -20,8 +20,8 @@
 
 case "$1" in
     configure)
-    ln -sf 
/var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/*
 /etc/surfnet_java-flowsa-ma || true
-    chown tomcat55 /var/run/surfnet_java-flowsa-ma
+    ln -sf 
/var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/WEB-INF/classes/perfsonar/conf/*
 /etc/surfnet-java-flowsa-ma || true
+    chown tomcat55 /var/run/surfnet-java-flowsa-ma
     /etc/init.d/tomcat5.5 restart
     ;;
 

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/postrm
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/postrm   2008-05-27 14:32:58 
UTC (rev 3879)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/postrm   2008-05-27 14:33:18 
UTC (rev 3880)
@@ -21,7 +21,7 @@
 
 case "$1" in
     purge)
-    rm /var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/*
+    rm /var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/*
     ;;
     
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)