perfsonar development work

Author: gijs
Date: 2008-09-30 08:05:45 -0400 (Tue, 30 Sep 2008)
New Revision: 4555

Removed:
   trunk/packaging/deb/ps-mdm-flowsa-ma/preinst
   trunk/packaging/deb/ps-mdm-flowsa-ma/prerm
   trunk/packaging/deb/ps-mdm-flowsa-ma/watch
Modified:
   trunk/packaging/deb/ps-mdm-flowsa-ma/conffiles
   trunk/packaging/deb/ps-mdm-flowsa-ma/dirs
   trunk/packaging/deb/ps-mdm-flowsa-ma/docs
   trunk/packaging/deb/ps-mdm-flowsa-ma/install
   trunk/packaging/deb/ps-mdm-flowsa-ma/postinst
   trunk/packaging/deb/ps-mdm-flowsub-mp/dirs
   trunk/packaging/deb/ps-mdm-flowsub-mp/docs
   trunk/packaging/deb/ps-mdm-flowsub-mp/install
   trunk/packaging/deb/ps-mdm-flowsub-mp/postinst
Log:


Modified: trunk/packaging/deb/ps-mdm-flowsa-ma/conffiles
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsa-ma/conffiles      2008-09-30 11:58:12 
UTC (rev 4554)
+++ trunk/packaging/deb/ps-mdm-flowsa-ma/conffiles      2008-09-30 12:05:45 
UTC (rev 4555)
@@ -1,6 +1,6 @@
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/components.properties
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/web.xml
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/components.properties
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/web.xml

Modified: trunk/packaging/deb/ps-mdm-flowsa-ma/dirs
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsa-ma/dirs   2008-09-30 11:58:12 UTC (rev 
4554)
+++ trunk/packaging/deb/ps-mdm-flowsa-ma/dirs   2008-09-30 12:05:45 UTC (rev 
4555)
@@ -1,4 +1,5 @@
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma
+/var/lib/tomcat5.5/webapps
+/usr/lib/perfsonar/services/ps-mdm-flowsa-ma
 /etc/ps-mdm-flowsa-ma
 /var/run/ps-mdm-flowsa-ma
 /var/lib/ps-mdm-flowsa-ma

Modified: trunk/packaging/deb/ps-mdm-flowsa-ma/docs
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsa-ma/docs   2008-09-30 11:58:12 UTC (rev 
4554)
+++ trunk/packaging/deb/ps-mdm-flowsa-ma/docs   2008-09-30 12:05:45 UTC (rev 
4555)
@@ -1 +1 @@
-/usr/share/doc/ps-mdm-flowsa-ma/*
+docs/*

Modified: trunk/packaging/deb/ps-mdm-flowsa-ma/install
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsa-ma/install        2008-09-30 11:58:12 
UTC (rev 4554)
+++ trunk/packaging/deb/ps-mdm-flowsa-ma/install        2008-09-30 12:05:45 
UTC (rev 4555)
@@ -1,2 +1 @@
-build/flowsama/* /var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma
-doc/* /usr/share/doc/ps-mdm-flowsa-ma
+build/flowsama/* /usr/lib/perfsonar/services/ps-mdm-flowsa-ma

Modified: trunk/packaging/deb/ps-mdm-flowsa-ma/postinst
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsa-ma/postinst       2008-09-30 11:58:12 
UTC (rev 4554)
+++ trunk/packaging/deb/ps-mdm-flowsa-ma/postinst       2008-09-30 12:05:45 
UTC (rev 4555)
@@ -17,12 +17,25 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+SERVICE="ps-mdm-flowsa-ma"
 
+
+
 case "$1" in
     configure)
-    ln -sf 
/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/* 
/etc/ps-mdm-flowsa-ma || true
-    chown tomcat55 
/var/lib/tomcat5.5/webapps/ps-mdm-flowsa-ma/WEB-INF/classes/perfsonar/conf/*
+    # Create link for easy access to configuration files
+    ln -sf 
/var/lib/tomcat5.5/webapps/$SERVICE/WEB-INF/classes/perfsonar/conf 
/etc/$SERVICE || true
+
+    # Link to enable service in tomcat5.5
+    ln -sf /usr/lib/perfsonar/services/$SERVICE 
/var/lib/tomcat5.5/webapps/$SERVICE
+
+    # Give tomcat access to the configure files
+    chown tomcat55 
/usr/lib/perfsonar/services/$SERVICE/WEB-INF/classes/perfsonar/conf/*
+
+    # give tomcat user write access to flow storage location
     chown tomcat55 /var/run/ps-mdm-flowsa-ma
+
+    # Restart tomcat to be sure the service will be correctly initialized
     /etc/init.d/tomcat5.5 restart
     ;;
 

Deleted: trunk/packaging/deb/ps-mdm-flowsa-ma/preinst

Deleted: trunk/packaging/deb/ps-mdm-flowsa-ma/prerm

Deleted: trunk/packaging/deb/ps-mdm-flowsa-ma/watch

Modified: trunk/packaging/deb/ps-mdm-flowsub-mp/dirs
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsub-mp/dirs  2008-09-30 11:58:12 UTC (rev 
4554)
+++ trunk/packaging/deb/ps-mdm-flowsub-mp/dirs  2008-09-30 12:05:45 UTC (rev 
4555)
@@ -1,4 +1,5 @@
-/var/lib/tomcat5.5/webapps/ps-mdm-flowsub-mp
+/var/lib/tomcat5.5/webapps
+/usr/lib/perfsonar/services/ps-mdm-flowsub-mp
 /etc/ps-mdm-flowsub-mp
 /var/lib/ps-mdm-flowsub-mp
 

Modified: trunk/packaging/deb/ps-mdm-flowsub-mp/docs
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsub-mp/docs  2008-09-30 11:58:12 UTC (rev 
4554)
+++ trunk/packaging/deb/ps-mdm-flowsub-mp/docs  2008-09-30 12:05:45 UTC (rev 
4555)
@@ -0,0 +1 @@
+doc/*

Modified: trunk/packaging/deb/ps-mdm-flowsub-mp/install
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsub-mp/install       2008-09-30 11:58:12 
UTC (rev 4554)
+++ trunk/packaging/deb/ps-mdm-flowsub-mp/install       2008-09-30 12:05:45 
UTC (rev 4555)
@@ -1 +1 @@
-build/ps-mdm-flowsub-mp/* /var/lib/tomcat5.5/webapps/ps-mdm-flowsub-mp
+build/ps-mdm-flowsub-mp/* /usr/lib/perfsonar/services/ps-mdm-flowsub-mp

Modified: trunk/packaging/deb/ps-mdm-flowsub-mp/postinst
===================================================================
--- trunk/packaging/deb/ps-mdm-flowsub-mp/postinst      2008-09-30 11:58:12 
UTC (rev 4554)
+++ trunk/packaging/deb/ps-mdm-flowsub-mp/postinst      2008-09-30 12:05:45 
UTC (rev 4555)
@@ -17,11 +17,20 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+SERVICE="ps-mdm-flowsub-mp"
 
 case "$1" in
     configure)
-    ln -sf 
/var/lib/tomcat5.5/webapps/ps-mdm-flowsub-mp/WEB-INF/classes/perfsonar/conf/* 
/etc/ps-mdm-flowsub-mp || true
-    chown tomcat55 
/var/lib/tomcat5.5/webapps/ps-mdm-flowsub-mp/WEB-INF/classes/perfsonar/conf/*
+    # Create link for easy access to configuration files
+    ln -sf 
/var/lib/tomcat5.5/webapps/$SERVICE/WEB-INF/classes/perfsonar/conf 
/etc/$SERVICE || true
+
+    # Link to enable service in tomcat5.5
+    ln -sf /usr/lib/perfsonar/services/$SERVICE 
/var/lib/tomcat5.5/webapps/$SERVICE
+
+    # Give tomcat access to the configure files
+    chown tomcat55 
/usr/lib/perfsonar/services/$SERVICE/WEB-INF/classes/perfsonar/conf/*
+
+    # Restart tomcat to be sure the service will be correctly initialized
     /etc/init.d/tomcat5.5 restart
     ;;