perfsonar development work

Author: psnc.lopatowski
Date: 2010-09-22 19:51:31 +0100 (Wed, 22 Sep 2010)
New Revision: 5753

Modified:
   trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
   trunk/perfsonar-install-dvd/centos-5.5/isolinux/psonar.msg
   trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
   trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun
   trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
   trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0
   trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1
   trunk/perfsonar-install-dvd/debian-5.0/isolinux/menu.cfg
   trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg
   trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig
   trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
   trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1
Log:


Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-09-22 
18:51:31 UTC (rev 5753)
@@ -48,7 +48,7 @@
 echo ">>> Installing perfSONAR prerequisite software <<<"
 echo
 rpm -ivh --nosignature 
/root/perfSONAR/rpms/rpmforge-release-0.5.1-1.el5.rf.i386.rpm
-cp -vf /root/perfSONAR/rpms/perfsonar-mdm-unstable.repo /etc/yum.repos.d
+cp -vf /root/perfSONAR/rpms/perfsonar-mdm-stable.repo /etc/yum.repos.d
 cat <<EOF>/etc/profile.d/jdk.sh
 export JAVA_HOME="/usr/java/jdk1.6.0_06"
 export JRE_HOME="/usr/java/jdk1.6.0_06/jre"
@@ -110,12 +110,11 @@
        echo
        /etc/init.d/mysqld start
        sh -c "mysql -u root < /root/perfSONAR/rpms/mysql-sqlma-dbsetup.sql"
-       rpm -ivh /root/perfSONAR/rpms/geant2-java-sql-ma-2.1-1.noarch.rpm
-       cp -vf /var/lib/tomcat5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/var/lib/tomcat5/common/endorsed
-       cp -vf /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/var/lib/tomcat5/common/endorsed
-       cp -vf /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/var/lib/tomcat5/common/endorsed
-       cp -vf 
/var/lib/tomcat5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/var/lib/tomcat5/common/endorsed
-       cp -vf 
/var/lib/tomcat5/webapps/geant2-java-sql-ma/WEB-INF/lib/xercesImpl-2.8.0.jar 
/var/lib/tomcat5/common/endorsed
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/rrdtool-1.2.30-2.el5.wrl.i686.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/rrdtool-devel-1.2.30-2.el5.wrl.i686.rpm
+       rpm -ivh --nosignature /root/perfSONAR/rpms/rrdjtool-1.0-1.i386.rpm
+       rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-sql-ma-2.3-rc1.noarch.rpm
        echo
 fi
 

Modified: trunk/perfsonar-install-dvd/centos-5.5/isolinux/psonar.msg
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/isolinux/psonar.msg  2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/centos-5.5/isolinux/psonar.msg  2010-09-22 
18:51:31 UTC (rev 5753)
@@ -12,3 +12,5 @@
  - To install desktop version of the system, type: 0bdesktop <ENTER>07.
  - To boot from local disk, press the 0b<ENTER>07 key.
 
+For more information please refer to the Admin Guide MDM 3.3 document 
available at: http://www.perfsonar.net/download.html and on this DVD in 
/perfSONAR/docs/ directory. 
+

Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2010-09-22 
18:51:31 UTC (rev 5753)
@@ -50,7 +50,7 @@
 echo ">>> Installing perfSONAR prerequisite software <<<"
 echo
 rpm -ivh --nosignature 
/root/perfSONAR/rpms/rpmforge-release-0.5.1-1.el5.rf.i386.rpm
-cp -vf /root/perfSONAR/rpms/perfsonar-mdm-unstable.repo /etc/yum.repos.d
+cp -vf /root/perfSONAR/rpms/perfsonar-mdm-stable.repo /etc/yum.repos.d
 cat <<EOF>/etc/profile.d/jdk.sh
 export JAVA_HOME="/usr/java/jdk1.6.0_06"
 export JRE_HOME="/usr/java/jdk1.6.0_06/jre"
@@ -111,8 +111,12 @@
        echo ">>> Installing perfSONAR SQL MA <<<"
        echo
        /etc/init.d/mysqld start
-       #sh -c "mysql -u root < /root/perfSONAR/rpms/mysql-sqlma-dbsetup.sql"
-       #rpm -ivh /root/perfSONAR/rpms/geant2-java-sql-ma-2.1-1.noarch.rpm
+       sh -c "mysql -u root < /root/perfSONAR/rpms/mysql-sqlma-dbsetup.sql"
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/rrdtool-1.2.30-2.el5.wrl.i686.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/rrdtool-devel-1.2.30-2.el5.wrl.i686.rpm
+       rpm -ivh --nosignature /root/perfSONAR/rpms/rrdjtool-1.0-1.i386.rpm
+       rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-sql-ma-2.3-rc1.noarch.rpm
        echo
 fi
 

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun     
2010-09-17 12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun     
2010-09-22 18:51:31 UTC (rev 5753)
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-# Iceweasel autorun script launched after user login
+# Iceweasel autorun script to be launched after user login
 
 iceweasel /home/psuser/perf.html &

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig      
2010-09-17 12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig      
2010-09-22 18:51:31 UTC (rev 5753)
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# Configuring autostart mechanism
+# Configuring Iceweasel autostart mechanism
 
 cp /root/perfSONAR/scripts/desktop/iceweaselautorun 
/etc/X11/Xsession.d/99iceweaselautorun
 chmod 777 /etc/X11/Xsession.d/99iceweaselautorun
 
-# Creating Iceweasel home page with links to installed pS services
+# Creating Iceweasel home page with links to installed perfSONAR services
 
 htmlfile=/home/psuser/perf.html
 touch $htmlfile
@@ -35,7 +35,7 @@
 fi
 
 if [[ $* == *5* ]]; then
-   echo "<p>      <b>BWCTL MP</b> (<a 
href=\"http://localhost:8180/\";>link</a>) </p>" >> $htmlfile
+   echo "<p>      <b>BWCTL MP</b> (<a 
href=\"http://localhost/geant2-perl-bwctl-mp/index.html\";>link</a>) </p>" >> 
$htmlfile
 fi
 
 if [[ $* == *6* ]]; then
@@ -49,3 +49,4 @@
 echo "<p> ---------------------------------------------------------------- 
</p> <br>" >> $htmlfile
 
 echo "</body> </html>" >> $htmlfile
+

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-09-22 
18:51:31 UTC (rev 5753)
@@ -64,7 +64,7 @@
 echo ">>> Configuring Iceweasel browser <<<"
 /root/perfSONAR/scripts/desktop/iceweaselconfig $select
 echo
-echo ">>> Setting JAVA_HOME varible <<<"
+echo ">>> Setting JAVA_HOME variable <<<"
 echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun-1.6.0.12"' | tee -a /etc/environment
 echo
 echo ">>> Installing tomcat5.5 <<<"
@@ -120,6 +120,9 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR SQL MA <<<"
        echo
+       echo "Creating mysql database ... "
+       mysql -u root < /root/perfSONAR/debs/mysql-sqlma-dbsetup.sql
+       echo
        apt-get -y install perfsonar-java-sql-ma
        echo
 fi
@@ -174,6 +177,7 @@
        echo
        apt-get -y install perfsonar-perl-e2emon-mp
        echo
+       echo ">>> Setting default host and port for E2Emon MP service <<<"
        sed -e 's/perl -I"..\/src" "..\/src\/G2_E2E_ServerDaemon.pl" -h HOST 
-p PORT -r XML-Registry-File/perl -I"..\/src" 
"..\/src\/G2_E2E_ServerDaemon.pl" -h localhost -p 8081 -r 
..\/data\/E2EmonRegFile.xml/' 
/opt/e2emon-mp_1.2-0rc0/bin/start_e2e_mp_daemon.sh > /root/temp
        mv /root/temp /opt/e2emon-mp_1.2-0rc0/bin/start_e2e_mp_daemon.sh
        chmod +x /opt/e2emon-mp_1.2-0rc0/bin/start_e2e_mp_daemon.sh

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2010-09-22 
18:51:31 UTC (rev 5753)
@@ -43,7 +43,7 @@
 OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root and perfsonar_ma MySQL users and the bwctl http user."
 fi
 
-dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 on 
Debian 5.0 Installation" \
+dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for Debian 5" \
        --msgbox "$OPTIONS" 8 60
 
 PASSWD=pass1
@@ -73,7 +73,7 @@
         rm /root/pass*
 done
 
-dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
+dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for Debian 5" \
        --infobox "\n             Configuration in progress ... \n\n          
   It may take several minutes." 7 60
 
 LOGFILE=/root/perfSONAR.log

Modified: trunk/perfsonar-install-dvd/debian-5.0/isolinux/menu.cfg
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/isolinux/menu.cfg    2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/isolinux/menu.cfg    2010-09-22 
18:51:31 UTC (rev 5753)
@@ -17,6 +17,11 @@
    - to install the OS with GNOME, choose: Install (desktop)
    - to boot existing OS from the hard drive, choose: Local boot
 
+   For more information about perfSONAR MDM DVD and perfSONAR services
+   intallation please refer to the Admin Guide MDM 3.3 document available at:
+   http://www.perfsonar.net/download.html and on this DVD in /perfSONAR/docs/
+   directory. 
+
    This installation will remove all partitions from your system !!
        endtext
        menu exit

Modified: trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg  2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg  2010-09-22 
18:51:31 UTC (rev 5753)
@@ -74,3 +74,4 @@
                                 in-target chmod +x 
/root/perfSONAR/scripts/desktop/chmysqlpass; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/desktop/iceweaselconfig; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/desktop/iceweaselautorun;
+

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig    2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig    2010-09-22 
18:51:31 UTC (rev 5753)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Configuring autostart mechanism
+# Configuring Lynx autostart mechanism
 
 echo "/root/lynxautorun" >> /root/.bashrc
 cp /root/perfSONAR/scripts/server/lynxautorun /root/
@@ -40,7 +40,7 @@
 fi
 
 if [[ $* == *5* ]]; then
-   echo "<p>      <b>BWCTL MP</b> (<a 
href=\"http://localhost:8180/\";>link</a>) </p>" >> $htmlfile
+   echo "<p>      <b>BWCTL MP</b> (<a 
href=\"http://localhost/geant2-perl-bwctl-mp/index.html\";>link</a>) </p>" >> 
$htmlfile
 fi
 
 if [[ $* == *6* ]]; then
@@ -54,3 +54,4 @@
 echo "<p> ---------------------------------------------------------------- 
</p> <br>" >> $htmlfile
 
 echo "</body> </html>" >> $htmlfile
+

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2010-09-22 
18:51:31 UTC (rev 5753)
@@ -65,7 +65,7 @@
 echo ">>> Configuring Lynx browser <<<"
 /root/perfSONAR/scripts/server/lynxconfig $select
 echo
-echo ">>> Setting JAVA_HOME varible <<<"
+echo ">>> Setting JAVA_HOME variable <<<"
 echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun-1.6.0.12"' | tee -a /etc/environment
 echo
 echo ">>> Installing tomcat5.5 <<<"
@@ -121,13 +121,11 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR SQL MA <<<"
        echo
-       apt-get -y install perfsonar-java-sql-ma
-       echo
        echo "Creating mysql database ... "
-       cp 
/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/mysql-sqlma-dbsetup.sql
 /root/perfSONAR/
-       mysql -u root < /root/perfSONAR/mysql-sqlma-dbsetup.sql
-       rm /root/perfSONAR/mysql-sqlma-dbsetup.sql
+       mysql -u root < /root/perfSONAR/debs/mysql-sqlma-dbsetup.sql
        echo
+       apt-get -y install perfsonar-java-sql-ma
+       echo
 fi
 
 if [[ $select == *5* ]]; then
@@ -180,6 +178,7 @@
        echo
        apt-get -y install perfsonar-perl-e2emon-mp
        echo
+       echo ">>> Setting default host and port for E2Emon MP service <<<"
        sed -e 's/perl -I"..\/src" "..\/src\/G2_E2E_ServerDaemon.pl" -h HOST 
-p PORT -r XML-Registry-File/perl -I"..\/src" 
"..\/src\/G2_E2E_ServerDaemon.pl" -h localhost -p 8081 -r 
..\/data\/E2EmonRegFile.xml/' 
/opt/e2emon-mp_1.2-0rc0/bin/start_e2e_mp_daemon.sh > /root/temp
        mv /root/temp /opt/e2emon-mp_1.2-0rc0/bin/start_e2e_mp_daemon.sh
        chmod +x /opt/e2emon-mp_1.2-0rc0/bin/start_e2e_mp_daemon.sh

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1  2010-09-17 
12:27:00 UTC (rev 5752)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1  2010-09-22 
18:51:31 UTC (rev 5753)
@@ -43,7 +43,7 @@
         rm /root/pass*
 done
 
-dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
+dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for Debian 5" \
        --infobox "\n             Configuration in progress ... \n\n          
   It may take several minutes." 7 60
 
 LOGFILE=/root/perfSONAR.log