perfsonar development work

Author: psnc.lopatowski
Date: 2010-12-06 15:32:00 +0000 (Mon, 06 Dec 2010)
New Revision: 5796

Added:
   trunk/perfsonar-install-dvd/centos-5.5/perfSONAR_MDM_3.3_Admin_Guide.txt
   trunk/perfsonar-install-dvd/debian-5.0/perfSONAR_MDM_3.3_Admin_Guide.txt
Modified:
   trunk/perfsonar-install-dvd/centos-5.5/README.txt
   trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
   trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1
   trunk/perfsonar-install-dvd/centos-5.5/packages.txt
   trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
   trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1
   trunk/perfsonar-install-dvd/debian-5.0/README.txt
   trunk/perfsonar-install-dvd/debian-5.0/desktop/chbwctlpass
   trunk/perfsonar-install-dvd/debian-5.0/desktop/chmysqlpass
   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/packages.txt
   trunk/perfsonar-install-dvd/debian-5.0/server/chmysqlpass
   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/README.txt
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/README.txt   2010-11-22 15:52:21 
UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/centos-5.5/README.txt   2010-12-06 15:32:00 
UTC (rev 5796)
@@ -47,7 +47,8 @@
 
   For detailed information about perfSONAR MDM DVD please refer to
   chapter "DVD Install" in Administator's Guide for MDM 3.3 document
-  available in /usr/share/doc/perfSONAR/ directory.
+  available at https://intranet.geant.net/sites/Services/SA2/T3/Pages/
+  LatestMDMAdminGuide.aspx
 
 ----------------------------------------------------------------------
                       perfSONAR MDM Support

Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-12-06 
15:32:00 UTC (rev 5796)
@@ -120,6 +120,10 @@
        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-1.noarch.rpm
        echo
+       echo "Setting sqlmaservice user password in services.properties file"
+       sed -e 
's/component.ma.xmldb.db_password=/component.ma.xmldb.db_password=sqlmaservice/'
 
/usr/share/tomcat5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
 > /root/service.properties
+       mv /root/service.properties 
/usr/share/tomcat5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
+       echo
 fi
 
 if [[ $select == *5* ]]; then
@@ -157,7 +161,7 @@
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Log-Dispatch-2.22-2.el5.pp.noarch.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-LibXML-Common-0.13-8.2.2.i386.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-LibXML-1.66-1.el5.rf.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-NMWG-0.02-rc1.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-NMWG-0.02-2.noarch.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-HTTP-Daemon-SSL-1.04-1.el5.rf.noarch.rpm
 
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-oppd-0.52-2.noarch.rpm
@@ -183,6 +187,8 @@
        echo
        rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-sshtelnet-mp-1.4-4.noarch.rpm
+       echo "Setting write permission for group to 
/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF"
+       chmod 775 
/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF
        echo
 fi
 

Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1 2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1 2010-12-06 
15:32:00 UTC (rev 5796)
@@ -34,13 +34,13 @@
 
 OPTIONS="\n   This will change the password for the root system \n   
account."
 if [[ $select == *4* ]]; then
-OPTIONS="\nThis will change the passwords for the root system user \nand the 
root and perfsonar_ma MySQL users."
+OPTIONS="\nThis will change the passwords for the root system user \nand the 
root MySQL user."
 fi
 #if [[ $select == *5* ]]; then
 #OPTIONS="\nThis will change the passwords for the root system user \nand 
the bwctl http user."
 #fi
 #if [[ $select == *4* ]] && [[ $select == *5* ]]; then
-#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root and perfsonar_ma MySQL users and the bwctl http user."
+#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root MySQL user and the bwctl http user."
 #fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for CentOS 5.5" \
@@ -95,11 +95,8 @@
 if [[ $select == *4* ]]; then
 echo ">>> Setting passwords for MySQL <<<"
 echo
-echo "SET PASSWORD FOR 'perfsonar_ma'@'localhost'=PASSWORD('\$PASSWD');" | 
mysql
-echo "SET PASSWORD FOR 'perfsonar_ma'@'%'=PASSWORD('\$PASSWD');" | mysql
-echo "SET PASSWORD FOR 'root'@'localhost.localdomain'=PASSWORD('\$PASSWD');" 
| mysql
-echo "SET PASSWORD FOR 'root'@'127.0.0.1'=PASSWORD('\$PASSWD');" | mysql
-echo "SET PASSWORD FOR 'root'@'localhost'=PASSWORD('\$PASSWD');" | mysql
+/usr/bin/mysqladmin -u root password $PASSWD
+echo $PASSWD | /usr/bin/mysqladmin -u root -h localhost.localdomain -p 
password $PASSWD
 echo
 fi
 

Modified: trunk/perfsonar-install-dvd/centos-5.5/packages.txt
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/packages.txt 2010-11-22 15:52:21 
UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/centos-5.5/packages.txt 2010-12-06 15:32:00 
UTC (rev 5796)
@@ -3,9 +3,7 @@
 iperf-2.0.2.tar.gz
 java-1.6.0-sun-compat-1.6.0.06-1jpp.i586.rpm
 jdk-6u6-linux-i586-rpm.bin
-mrtg-2.16.2.tar.gz
 mysql-sqlma-dbsetup.sql
-owamp-3.0c.tar.gz
 perfsonar-clmp-2.1-1.noarch.rpm
 perfsonar-java-as-1.3-1.noarch.rpm
 perfsonar-java-rrd-ma-3.3.1-1.noarch.rpm
@@ -31,7 +29,7 @@
 perl-MIME-Lite-3.023-1.el5.rf.noarch.rpm
 perl-Net-Jabber-2.0-10.el5.noarch.rpm
 perl-Net-XMPP-1.02-1.el5.rf.noarch.rpm
-perl-NMWG-0.02-rc1.noarch.rpm
+perl-NMWG-0.02-2.noarch.rpm
 perl-Params-Validate-0.91-1.el5.rf.i386.rpm
 perl-rrdtool-1.2.30-1.centos5.i386.rpm
 perl-SOAP-Lite-0.710.08-1.el5.rf.noarch.rpm
@@ -45,6 +43,8 @@
 perl-XML-RegExp-0.03-2.el5.noarch.rpm
 perl-XML-Stream-1.22-1.el5.pp.noarch.rpm
 rpmforge-release-0.5.1-1.el5.rf.i386.rpm
+rrd_database_test.xml
 rrdjtool-1.0-1.i386.rpm
 rrdtool-1.2.30-2.el5.wrl.i686.rpm
 rrdtool-devel-1.2.30-2.el5.wrl.i686.rpm
+sql-database_TEST.xml

Added: 
trunk/perfsonar-install-dvd/centos-5.5/perfSONAR_MDM_3.3_Admin_Guide.txt
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/perfSONAR_MDM_3.3_Admin_Guide.txt  
                          (rev 0)
+++ trunk/perfsonar-install-dvd/centos-5.5/perfSONAR_MDM_3.3_Admin_Guide.txt  
  2010-12-06 15:32:00 UTC (rev 5796)
@@ -0,0 +1,5 @@
+Administrator's Guide text is currently only available at 
+https://intranet.geant.net/sites/Services/SA2/T3/Pages/LatestMDMAdminGuide.aspx
+
+We apologize for your inconvenience.
+Administrator's Guide document will be included in the next perfSONAR MDM 
DVD release.

Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2010-12-06 
15:32:00 UTC (rev 5796)
@@ -122,6 +122,10 @@
        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-1.noarch.rpm
        echo
+       echo "Setting sqlmaservice user password in services.properties file"
+       sed -e 
's/component.ma.xmldb.db_password=/component.ma.xmldb.db_password=sqlmaservice/'
 
/usr/share/tomcat5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
 > /root/service.properties
+       mv /root/service.properties 
/usr/share/tomcat5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
+       echo
 fi
 
 if [[ $select == *5* ]]; then
@@ -159,7 +163,7 @@
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Log-Dispatch-2.22-2.el5.pp.noarch.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-LibXML-Common-0.13-8.2.2.i386.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-LibXML-1.66-1.el5.rf.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-NMWG-0.02-rc1.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-NMWG-0.02-2.noarch.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-HTTP-Daemon-SSL-1.04-1.el5.rf.noarch.rpm
 
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-oppd-0.52-2.noarch.rpm
@@ -185,6 +189,8 @@
        echo
        rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-sshtelnet-mp-1.4-4.noarch.rpm
+       echo "Setting write permission for group to 
/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF"
+       chmod 775 
/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF
        echo
 fi
 

Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1  2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1  2010-12-06 
15:32:00 UTC (rev 5796)
@@ -4,13 +4,13 @@
 
 OPTIONS="\n   This will change the password for the root system \n   
account."
 if [[ $select == *4* ]]; then
-OPTIONS="\nThis will change the passwords for the root system user \nand the 
root and perfsonar_ma MySQL users."
+OPTIONS="\nThis will change the passwords for the root system user \nand the 
root MySQL user."
 fi
 #if [[ $select == *5* ]]; then
 #OPTIONS="\nThis will change the passwords for the root system user \nand 
the bwctl http user."
 #fi
 #if [[ $select == *4* ]] && [[ $select == *5* ]]; then
-#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root and perfsonar_ma MySQL users and the bwctl http user."
+#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root MySQL user and the bwctl http user."
 #fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 on 
CentOS 5.5 Installation" \
@@ -62,11 +62,8 @@
 if [[ $select == *4* ]]; then
 echo ">>> Setting passwords for MySQL <<<"
 echo
-echo "SET PASSWORD FOR 'perfsonar_ma'@'localhost'=PASSWORD('\$PASSWD');" | 
mysql
-echo "SET PASSWORD FOR 'perfsonar_ma'@'%'=PASSWORD('\$PASSWD');" | mysql
-echo "SET PASSWORD FOR 'root'@'localhost.localdomain'=PASSWORD('\$PASSWD');" 
| mysql
-echo "SET PASSWORD FOR 'root'@'127.0.0.1'=PASSWORD('\$PASSWD');" | mysql
-echo "SET PASSWORD FOR 'root'@'localhost'=PASSWORD('\$PASSWD');" | mysql
+/usr/bin/mysqladmin -u root password $PASSWD
+echo $PASSWD | /usr/bin/mysqladmin -u root -h localhost.localdomain -p 
password $PASSWD
 echo
 fi
 

Modified: trunk/perfsonar-install-dvd/debian-5.0/README.txt
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/README.txt   2010-11-22 15:52:21 
UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/README.txt   2010-12-06 15:32:00 
UTC (rev 5796)
@@ -47,7 +47,8 @@
 
   For detailed information about perfSONAR MDM DVD please refer to
   chapter "DVD Install" in Administator's Guide for MDM 3.3 document
-  available in /usr/share/doc/perfSONAR/ directory.
+  available at https://intranet.geant.net/sites/Services/SA2/T3/Pages/
+  LatestMDMAdminGuide.aspx
 
 ----------------------------------------------------------------------
                       perfSONAR MDM Support

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/chbwctlpass
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/chbwctlpass  2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/chbwctlpass  2010-12-06 
15:32:00 UTC (rev 5796)
@@ -12,4 +12,4 @@
 
 send "$password\r"
 send "\r"
-expect eof
\ No newline at end of file
+expect eof

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/chmysqlpass
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/chmysqlpass  2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/chmysqlpass  2010-12-06 
15:32:00 UTC (rev 5796)
@@ -4,19 +4,11 @@
 
 spawn /bin/bash
 
-send -- "mysql\r"
+send "/usr/bin/mysqladmin -u root password '$password'\r"
 
-expect "mysql>"
-send "SET PASSWORD FOR 'perfsonar_ma'@'localhost'=PASSWORD('$password');\r"
+send "/usr/bin/mysqladmin -u root -h localhost.localdomain -p password 
'$password'\r"
+expect "password:"
 
-expect "mysql>"
-send "SET PASSWORD FOR 'perfsonar_ma'@'%'=PASSWORD('$password');\r"
-
-expect "mysql>"
-send "SET PASSWORD FOR 'root'@'127.0.0.1'=PASSWORD('$password');\r"
-
-expect "mysql>"
-send "SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$password');\r"
-
-send "exit\r"
-expect eof
\ No newline at end of file
+send "$password\r"
+send "\r"
+expect eof

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig      
2010-11-22 15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig      
2010-12-06 15:32:00 UTC (rev 5796)
@@ -15,7 +15,7 @@
 echo "<body>" >> $htmlfile
 echo "<p> perfSONAR www.perfsonar.net </p>" >> $htmlfile
 echo "<p> PERFormance Service Oriented Network monitoring ARchitecture </p>" 
>> $htmlfile
-echo "<p> ---------------------------------------------------------------- 
</p> <br>" >> $htmlfile
+echo "<p> ---------------------------------------------------------------- 
</p>" >> $htmlfile
 echo "<p> Installed perfSONAR MDM 3.3 services: </p>" >> $htmlfile
 
 if [[ $* == *1* ]]; then

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-12-06 
15:32:00 UTC (rev 5796)
@@ -31,6 +31,7 @@
 
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
        --yesno "\n      Use packages only from local repository?" 7 60
+choice1=$?
 
 select=$(cat /root/select.txt)
 
@@ -48,7 +49,7 @@
 echo ">>> Performing prerequisite operations <<<"
 echo
 
-if [ $choice == 1 ]; then 
+if [ $choice1 != 0 ]; then 
 echo ">>> Adding/Configuring perfSONAR online repositories <<<"
 echo ">>> Online repositories will be available during installation <<<"
 echo
@@ -67,6 +68,8 @@
 echo ">>> Setting JAVA_HOME variable <<<"
 echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun-1.6.0.12"' | tee -a /etc/environment
 echo
+
+if [[ $select == *1* ]] || [[ $select == *2* ]] || [[ $select == *3* ]] || 
[[ $select == *4* ]] || [[ $select == *6* ]]; then 
 echo ">>> Installing tomcat5.5 <<<"
 apt-get -y install tomcat5.5
 echo
@@ -75,6 +78,7 @@
 sed -e 
's/#JAVA_HOME=\/usr\/lib\/jvm\/java-6-sun/JAVA_HOME=\/usr\/lib\/jvm\/java-6-sun-1.6.0.12/'
 /root/tomcat5.5 > /etc/default/tomcat5.5
 rm /root/tomcat5.5
 echo
+fi
 
 if [[ $select == *1* ]]; then
        exec 1>&6 6>&-
@@ -125,6 +129,10 @@
        echo
        apt-get -y install perfsonar-java-sql-ma
        echo
+       echo "Setting sqlmaservice user password in services.properties file"
+       sed -e 
's/component.ma.xmldb.db_password=/component.ma.xmldb.db_password=sqlmaservice/'
 
/usr/share/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
 > /root/service.properties
+       mv /root/service.properties 
/usr/share/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
+       echo
 fi
 
 if [[ $select == *5* ]]; then
@@ -187,7 +195,7 @@
        echo
 fi
 
-if [ $choice == 0 ]; then 
+if [ $choice1 == 0 ]; then 
 echo ">>> Adding/Configuring perfSONAR online repositories <<<"
 echo ">>> after services installation <<<"
 echo

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2010-12-06 
15:32:00 UTC (rev 5796)
@@ -34,13 +34,13 @@
 
 OPTIONS="\n   This will change the password for the root system \n   
account."
 if [[ $select == *4* ]]; then
-OPTIONS="\nThis will change the passwords for the root system user \nand the 
root and perfsonar_ma MySQL users."
+OPTIONS="\nThis will change the passwords for the root system user \nand the 
root MySQL user."
 fi
 #if [[ $select == *5* ]]; then
 #OPTIONS="\nThis will change the passwords for the root system user \nand 
the bwctl http user."
 #fi
 #if [[ $select == *4* ]] && [[ $select == *5* ]]; then
-#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root and perfsonar_ma MySQL users and the bwctl http user."
+#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root MySQL user and the bwctl http user."
 #fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for Debian 5" \
@@ -109,8 +109,6 @@
 rm -f /etc/rc2.d/S25postinstall1
 echo "Passwords have been modified."
 echo
-echo "Press [ENTER] to continue..."
-# read
 
 exec 1>&6 6>&-
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
@@ -119,3 +117,5 @@
 rm /root/select.txt
 find /root -name TRANS.TBL -exec rm {} \;
 
+
+

Modified: trunk/perfsonar-install-dvd/debian-5.0/packages.txt
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/packages.txt 2010-11-22 15:52:21 
UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/packages.txt 2010-12-06 15:32:00 
UTC (rev 5796)
@@ -17,7 +17,7 @@
 libipc-shareable-perl_0.60-7_all.deb
 liblog-dispatch-perl_2.18-1_all.deb
 liblog-trace-perl_1.070-2_all.deb
-libnmwg-perl_0.02-0rc1_all.deb
+libnmwg-perl_0.02-2_all.deb
 librrd2_1.2.15-0.3_i386.deb
 libtest-assertions-perl_1.054-2_all.deb
 libtiff4_3.8.2-11.2_i386.deb
@@ -31,7 +31,9 @@
 perfsonar-oppd_0.52-2_all.deb
 perfsonar-oppd-mp-bwctl_0.52-2_all.deb
 perfsonar-perl-e2emon-mp_1.2_all.deb
+rrd_database_test.xml
 rrdjtool-debian5_1.1-1_i386.deb
+sql-database_TEST.xml
 sun-java6-bin_6-12-1_i386.deb
 sun-java6-jre_6-12-1_all.deb
 tomcat5.5_5.5.26-5_all.deb

Added: 
trunk/perfsonar-install-dvd/debian-5.0/perfSONAR_MDM_3.3_Admin_Guide.txt
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/perfSONAR_MDM_3.3_Admin_Guide.txt  
                          (rev 0)
+++ trunk/perfsonar-install-dvd/debian-5.0/perfSONAR_MDM_3.3_Admin_Guide.txt  
  2010-12-06 15:32:00 UTC (rev 5796)
@@ -0,0 +1,5 @@
+Administrator's Guide text is currently only available at 
+https://intranet.geant.net/sites/Services/SA2/T3/Pages/LatestMDMAdminGuide.aspx
+
+We apologize for your inconvenience.
+Administrator's Guide document will be included in the next perfSONAR MDM 
DVD release. 

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/chmysqlpass
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/chmysqlpass   2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/chmysqlpass   2010-12-06 
15:32:00 UTC (rev 5796)
@@ -4,19 +4,11 @@
 
 spawn /bin/bash
 
-send -- "mysql\r"
+send "/usr/bin/mysqladmin -u root password '$password'\r"
 
-expect "mysql>"
-send "SET PASSWORD FOR 'perfsonar_ma'@'localhost'=PASSWORD('$password');\r"
+send "/usr/bin/mysqladmin -u root -h localhost.localdomain -p password 
'$password'\r"
+expect "password:"
 
-expect "mysql>"
-send "SET PASSWORD FOR 'perfsonar_ma'@'%'=PASSWORD('$password');\r"
-
-expect "mysql>"
-send "SET PASSWORD FOR 'root'@'127.0.0.1'=PASSWORD('$password');\r"
-
-expect "mysql>"
-send "SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$password');\r"
-
-send "exit\r"
-expect eof
\ No newline at end of file
+send "$password\r"
+send "\r"
+expect eof

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2010-12-06 
15:32:00 UTC (rev 5796)
@@ -31,7 +31,7 @@
 
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
        --yesno "\n      Use packages only from local repository?" 7 60
-choice=$?
+choice1=$?
 
 select=$(cat /root/select.txt)
 
@@ -49,7 +49,7 @@
 echo ">>> Performing prerequisite operations <<<"
 echo
 
-if [ $choice == 1 ]; then 
+if [ $choice1 != 0 ]; then 
 echo ">>> Adding/Configuring perfSONAR online repositories <<<"
 echo ">>> Online repositories will be available during installation <<<"
 echo
@@ -68,6 +68,8 @@
 echo ">>> Setting JAVA_HOME variable <<<"
 echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun-1.6.0.12"' | tee -a /etc/environment
 echo
+
+if [[ $select == *1* ]] || [[ $select == *2* ]] || [[ $select == *3* ]] || 
[[ $select == *4* ]] || [[ $select == *6* ]]; then 
 echo ">>> Installing tomcat5.5 <<<"
 apt-get -y install tomcat5.5
 echo
@@ -76,6 +78,7 @@
 sed -e 
's/#JAVA_HOME=\/usr\/lib\/jvm\/java-6-sun/JAVA_HOME=\/usr\/lib\/jvm\/java-6-sun-1.6.0.12/'
 /root/tomcat5.5 > /etc/default/tomcat5.5
 rm /root/tomcat5.5
 echo
+fi
 
 if [[ $select == *1* ]]; then
        exec 1>&6 6>&-
@@ -126,6 +129,10 @@
        echo
        apt-get -y install perfsonar-java-sql-ma
        echo
+       echo "Setting sqlmaservice user password in services.properties file"
+       sed -e 
's/component.ma.xmldb.db_password=/component.ma.xmldb.db_password=sqlmaservice/'
 
/usr/share/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
 > /root/service.properties
+       mv /root/service.properties 
/usr/share/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
+       echo
 fi
 
 if [[ $select == *5* ]]; then
@@ -188,7 +195,7 @@
        echo
 fi
 
-if [ $choice == 0 ]; then 
+if [ $choice1 == 0 ]; then 
 echo ">>> Adding/Configuring perfSONAR online repositories <<<"
 echo ">>> after services installation <<<"
 echo

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1  2010-11-22 
15:52:21 UTC (rev 5795)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1  2010-12-06 
15:32:00 UTC (rev 5796)
@@ -4,13 +4,13 @@
 
 OPTIONS="\n   This will change the password for the root system \n   
account."
 if [[ $select == *4* ]]; then
-OPTIONS="\nThis will change the passwords for the root system user \nand the 
root and perfsonar_ma MySQL users."
+OPTIONS="\nThis will change the passwords for the root system user \nand the 
root MySQL user."
 fi
 #if [[ $select == *5* ]]; then
 #OPTIONS="\nThis will change the passwords for the root system user \nand 
the bwctl http user."
 #fi
 #if [[ $select == *4* ]] && [[ $select == *5* ]]; then
-#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root and perfsonar_ma MySQL users and the bwctl http user."
+#OPTIONS="\nThis will change the passwords for the root system user, \nthe 
root MySQL users and the bwctl http user."
 #fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for Debian 5" \