Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4569 - in trunk/geant2-java-rrd-ma: conf packaging/deb

Subject: perfsonar development work

List archive

perfsonar: r4569 - in trunk/geant2-java-rrd-ma: conf packaging/deb


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4569 - in trunk/geant2-java-rrd-ma: conf packaging/deb
  • Date: Wed, 1 Oct 2008 08:29:38 -0400
Author: roman
Date: 2008-10-01 08:29:37 -0400 (Wed, 01 Oct 2008)
New Revision: 4569

Modified:
trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml
trunk/geant2-java-rrd-ma/packaging/deb/postinst
trunk/geant2-java-rrd-ma/packaging/deb/postrm
Log:
relates to rev number 4568



Modified: trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml
===================================================================
--- trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml 2008-10-01 11:58:14
UTC (rev 4568)
+++ trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml 2008-10-01 12:29:37
UTC (rev 4569)
@@ -30,7 +30,7 @@
<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

@@ -67,7 +67,7 @@
<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">outoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

@@ -107,7 +107,7 @@
<nmwg:data id="data3" metadataIdRef="meta3">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>

@@ -147,7 +147,7 @@
<nmwg:data id="data4" metadataIdRef="meta4">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>


Modified: trunk/geant2-java-rrd-ma/packaging/deb/postinst
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/deb/postinst 2008-10-01 11:58:14
UTC (rev 4568)
+++ trunk/geant2-java-rrd-ma/packaging/deb/postinst 2008-10-01 12:29:37
UTC (rev 4569)
@@ -17,33 +17,37 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

+SERVICENAME="geant2-java-rrd-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"

+
+
case "$1" in
configure)
- if [ -h /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- ln -s /usr/lib/perfsonar/services/geant2-java-rrd-ma
/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma || true
- if [ -h /etc/geant2-java-rrd-ma ]
+ ln -s $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME
|| true
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/geant2-java-rrd-ma
+ rm /etc/$SERVICENAME
fi
- ln -s
/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
/etc/geant2-java-rrd-ma || true
+ ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true

- if [ -h /var/log/geant2-java-rrd-ma ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/geant2-java-rrd-ma
+ rm /var/log/$SERVICENAME
fi
- ln -s /var/log/tomcat5.5 /var/log/geant2-java-rrd-ma || true
+ ln -s /var/log/tomcat5.5 /var/log/$SERVICENAME || true

- if [ -h /usr/share/doc/geant2-java-rrd-ma/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/geant2-java-rrd-ma/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
- ln -s /usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/doc
/usr/share/doc/geant2-java-rrd-ma/spec || true
+ ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true

- chown -R tomcat55
/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
+ chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/init.d/geant2-tomcat5.5 restart
;;


Modified: trunk/geant2-java-rrd-ma/packaging/deb/postrm
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/deb/postrm 2008-10-01 11:58:14
UTC (rev 4568)
+++ trunk/geant2-java-rrd-ma/packaging/deb/postrm 2008-10-01 12:29:37
UTC (rev 4569)
@@ -19,23 +19,26 @@
# the debian-policy package


+SERVICENAME="geant2-java-rrd-ma"
+
+
case "$1" in
purge)
- if [ -h /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- if [ -h /etc/geant2-java-rrd-ma ]
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/geant2-java-rrd-ma
+ rm /etc/$SERVICENAME
fi
- if [ -h /var/log/geant2-java-rrd-ma ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/geant2-java-rrd-ma
+ rm /var/log/$SERVICENAME
fi
- if [ -h /usr/share/doc/geant2-java-rrd-ma/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/geant2-java-rrd-ma/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
;;



  • perfsonar: r4569 - in trunk/geant2-java-rrd-ma: conf packaging/deb, svnlog, 10/01/2008

Archive powered by MHonArc 2.6.16.

Top of Page