perfsonar development work

Author: gijs
Date: 2008-05-20 08:01:35 -0400 (Tue, 20 May 2008)
New Revision: 3854

Modified:
   trunk/packaging/deb/surfnet_java-rrd-ma/changelog
   trunk/packaging/deb/surfnet_java-rrd-ma/conffiles
   trunk/packaging/deb/surfnet_java-rrd-ma/dirs
   trunk/packaging/deb/surfnet_java-rrd-ma/install
   trunk/packaging/deb/surfnet_java-rrd-ma/postinst
   trunk/packaging/deb/surfnet_java-rrd-ma/postrm
Log:
updated to new filesytem layout



Modified: trunk/packaging/deb/surfnet_java-rrd-ma/changelog
===================================================================
--- trunk/packaging/deb/surfnet_java-rrd-ma/changelog   2008-05-20 09:24:35 
UTC (rev 3853)
+++ trunk/packaging/deb/surfnet_java-rrd-ma/changelog   2008-05-20 12:01:35 
UTC (rev 3854)
@@ -1,6 +1,11 @@
-surfnet-java-flowsa-ma (0.2-1) unstable; urgency=low
+surfnet-java-flowsa-ma (0.2-2) unstable; urgency=low
 
+  * changed to new perfsonar filesystem layout
+
+ -- Gijs Molenaar 
<@surfnet.nl>
  Tue, 20 May 2008 13:53:51 +0200
+
+surfnet-java-flowsa-ma (0.2-1) intrepid; urgency=low
+
   * Initial release
 
- -- Gijs Molenaar 
<>
  Tue, 29 Apr 2008 14:10:17 +0200
-
+ -- Gijs Molenaar 
<gijs@gijs-desktop>
  Tue, 20 May 2008 13:53:46 +0200

Modified: trunk/packaging/deb/surfnet_java-rrd-ma/conffiles
===================================================================
--- trunk/packaging/deb/surfnet_java-rrd-ma/conffiles   2008-05-20 09:24:35 
UTC (rev 3853)
+++ trunk/packaging/deb/surfnet_java-rrd-ma/conffiles   2008-05-20 12:01:35 
UTC (rev 3854)
@@ -1,5 +1,5 @@
-/opt/perfsonar/services/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/components.properties
-/opt/perfsonar/services/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/opt/perfsonar/services/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
-/opt/perfsonar/services/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/opt/perfsonar/services/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-rrd-ma/dirs
===================================================================
--- trunk/packaging/deb/surfnet_java-rrd-ma/dirs        2008-05-20 09:24:35 
UTC (rev 3853)
+++ trunk/packaging/deb/surfnet_java-rrd-ma/dirs        2008-05-20 12:01:35 
UTC (rev 3854)
@@ -1,4 +1,4 @@
-/opt/perfsonar/services/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-rrd-ma/install
===================================================================
--- trunk/packaging/deb/surfnet_java-rrd-ma/install     2008-05-20 09:24:35 
UTC (rev 3853)
+++ trunk/packaging/deb/surfnet_java-rrd-ma/install     2008-05-20 12:01:35 
UTC (rev 3854)
@@ -1 +1 @@
-build/flowsama/* /opt/perfsonar/services/surfnet_java-flowsa-ma
+build/flowsama/* /var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma

Modified: trunk/packaging/deb/surfnet_java-rrd-ma/postinst
===================================================================
--- trunk/packaging/deb/surfnet_java-rrd-ma/postinst    2008-05-20 09:24:35 
UTC (rev 3853)
+++ trunk/packaging/deb/surfnet_java-rrd-ma/postinst    2008-05-20 12:01:35 
UTC (rev 3854)
@@ -20,11 +20,9 @@
 
 case "$1" in
     configure)
-    ln -sf 
/opt/perfsonar/services/surfnet_java-flowsa-ma/WEB-INF/classes/perfsonar/conf/*
 /etc/surfnet_java-flowsa-ma || true
-    ln -s /opt/perfsonar/services/surfnet_java-flowsa-ma 
/opt/perfsonar/tomcat/webapps || true
-    chgrp perfsonar /var/run/surfnet_java-flowsa-ma
-    chmod 775 /var/run/surfnet_java-flowsa-ma
-    /etc/init.d/perfsonar-tomcat restart
+    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
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/packaging/deb/surfnet_java-rrd-ma/postrm
===================================================================
--- trunk/packaging/deb/surfnet_java-rrd-ma/postrm      2008-05-20 09:24:35 
UTC (rev 3853)
+++ trunk/packaging/deb/surfnet_java-rrd-ma/postrm      2008-05-20 12:01:35 
UTC (rev 3854)
@@ -21,8 +21,7 @@
 
 case "$1" in
     purge)
-    rm /etc/surfnet_java-flowsa-ma/*
-    rm /opt/perfsonar/tomcat/webapps/surfnet_java-flowsa-ma
+    rm /var/lib/tomcat5.5/webapps/surfnet_java-flowsa-ma/*
     ;;
     
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)