perfsonar development work

Author: psnc.lopatowski
Date: 2011-06-17 15:02:10 +0100 (Fri, 17 Jun 2011)
New Revision: 5812

Added:
   trunk/perfsonar-install-dvd/centos-5.5/desktop/setgeantbackground
   trunk/perfsonar-install-dvd/centos-5.5/java6-install.sh
   trunk/perfsonar-install-dvd/centos-5.5/mysql-install.sh
   trunk/perfsonar-install-dvd/centos-5.5/tomcat-install.sh
Modified:
   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/ks-desktop.cfg
   trunk/perfsonar-install-dvd/centos-5.5/ks.cfg
   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
Log:


Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2011-03-15 
15:32:28 UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2011-06-17 
14:02:10 UTC (rev 5812)
@@ -3,23 +3,7 @@
 LOGFILE=/root/perfSONAR.log
 
 clear
-dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 DVD for 
CentOS 5.5" \
-       --msgbox "\nThis will install the Sun Microsystems Java 
Platform.\nPlease, accept the license terms; otherwise, perfSONAR 
\ninstallation will not be fully operational." 8 60
 
-if /root/perfSONAR/rpms/jdk-6u6-linux-i586-rpm.bin; then
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/java-1.6.0-sun-compat-1.6.0.06-1jpp.i586.rpm
-       /usr/sbin/alternatives --set java /usr/lib/jvm/jre-1.6.0-sun/bin/java
-       /etc/init.d/tomcat5 restart
-       dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
-               --infobox "\n                Installation finished." 5 60
-       sleep 3
-else
-       dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
-               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation." 10 60
-fi
-echo
-clear
-
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for CentOS 5.5" \
        --msgbox "\n       This will install the perfSONAR MDM 3.3" 6 60
 
@@ -41,6 +25,9 @@
        choice=$?
 done
 
+dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for CentOS 5.5" \
+       --infobox "\n            Installation in progress ..." 5 60
+
 select=$(cat /root/select.txt)
 
 exec 6>&1
@@ -49,20 +36,49 @@
 echo
 rpm -ivh --nosignature 
/root/perfSONAR/rpms/rpmforge-release-0.5.1-1.el5.rf.i386.rpm
 
+echo
 echo ">>> Configuring perfSONAR repositories <<<"
 echo
+mkdir -pv /repo/centos/5/os/i386/CentOS/RPMS
+cp /root/perfSONAR/rpms/*.rpm /repo/centos/5/os/i386/CentOS/RPMS/
+createrepo /repo/centos/5/os/i386/
+cp -vf /root/perfSONAR/rpms/perfsonar-mdm-local.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"
-EOF
-chmod a+x /etc/profile.d/jdk.sh
 echo
+
+if [[ $select == *1* ]] || [[ $select == *2* ]] || [[ $select == *3* ]] || 
[[ $select == *4* ]] || [[ $select == *6* ]]; then
+       echo ">>> Java6 installation required?: YES"
+       echo ">>> Tomcat5.5 installation required?: YES"
+       echo
+       /root/perfSONAR/scripts/java6-install.sh
+       /root/perfSONAR/scripts/tomcat-install.sh
+else
+       echo ">>> Java6 installation required?: NO"
+       echo ">>> Tomcat5.5 installation required?: NO"
+       echo
+fi
+
+if [[ $select == *4* ]]; then
+       echo ">>> MySql installation required?: YES"
+       echo
+       /root/perfSONAR/scripts/mysql-install.sh
+else
+       echo ">>> MySql installation required?: NO"
+       echo
+fi
+
 echo ">>> Configuring Firefox browser <<<"
 /root/perfSONAR/scripts/desktop/firefoxconfig $select
 echo
 
+echo ">>> Configuring GN3 background <<<"
+cp /root/perfSONAR/scripts/desktop/setgeantbackground /home/psuser/
+chmod 777 /home/psuser/setgeantbackground
+cp /root/perfSONAR/rpms/GEANT3-logo.gif /home/psuser/
+echo "/home/psuser/setgeantbackground" >> /etc/X11/xinit/xinitrc-common
+echo
+
+
 if [[ $select == *1* ]]; then
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
@@ -71,8 +87,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Lookup Service <<<"
        echo
-       rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-xml-ls-1.5-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-xml-ls
        echo
 fi
 
@@ -84,7 +99,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Authentication Service <<<"
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-as-1.3-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-as
        echo
 fi
 
@@ -96,11 +111,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR RRD MA <<<"
        echo
-       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-rrd-ma-3.3.1-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-rrd-ma
        echo
 fi
 
@@ -113,12 +124,7 @@
        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 --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-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
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/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
 > /root/service.properties
@@ -146,34 +152,7 @@
        echo
        echo ">>> bwctl-1.2a software installed in /usr/lib/bwctl <<<"
        echo
-
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Config-General-2.40-1.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-IO-Tty-1.07-2.el5.kb.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-IPC-Run-0.80-3.el5.kb.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-IPC-Shareable-0.60-3.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MailTools-2.04-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Email-Date-Format-1.002-4.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MIME-Lite-3.023-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Mail-Sender-0.8.16-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Mail-Sendmail-0.79-9.el5.1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Params-Validate-0.91-1.el5.rf.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Sys-Syslog-0.27-2.el5.pp.i386.rpm
-       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-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
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-oppd-mp-bwctl-0.52-2.noarch.rpm
-
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/test.pl
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/finish.pl 
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/wizard.pl 
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/etc/oppd.conf
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/service.pl 
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/logging.pl
-#      sed -i s/#AddHandler\ cgi-script\ .cgi/AddHandler\ cgi-script\ .cgi\ 
.pl/g /etc/httpd/conf/httpd.conf
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-oppd-mp-bwctl
        echo
 fi
 
@@ -185,8 +164,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Telnet/SSH MP <<<"
        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
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-sshtelnet-mp
        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
@@ -199,24 +177,8 @@
        exec 6>&1
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR E2EMon MP <<<"
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-perl-e2emon-mp
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MailTools-2.04-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Email-Date-Format-1.002-4.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MIME-Lite-3.023-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-Parser-2.36-3.el5.pp.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-RegExp-0.03-2.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-GSSAPI-0.26-1.el5.rf.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Authen-SASL-2.14-1.el5.pp.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-Stream-1.22-1.el5.pp.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Net-XMPP-1.02-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Time-modules-2003.1126-4.el5.1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Net-Jabber-2.0-10.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-version-0.76-1.el5.pp.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-DOM-1.44-2.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-SOAP-Lite-0.710.08-1.el5.rf.noarch.rpm
-
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-perl-e2emon-mp-1.2-0.noarch.rpm
-       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/perfsonar-perl-e2emon-mp-1.2-0/bin/start_e2e_mp_daemon.sh > /root/temp
        mv /root/temp 
/opt/perfsonar-perl-e2emon-mp-1.2-0/bin/start_e2e_mp_daemon.sh

Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1 2011-03-15 
15:32:28 UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1 2011-06-17 
14:02:10 UTC (rev 5812)
@@ -36,12 +36,6 @@
 if [[ $select == *4* ]]; then
 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 MySQL user and the bwctl http user."
-#fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for CentOS 5.5" \
        --msgbox "$OPTIONS" 7 60
@@ -100,13 +94,6 @@
 echo
 fi
 
-#if [[ $select == *5* ]]; then
-#echo ">>> Setting password for bwctl http user <<<"
-#echo
-#htpasswd -b -c /etc/httpd/conf/htusers bwctl \$PASSWD
-#echo
-#fi
-
 rm -f /etc/rc.d/rc5.d/S000postinstall1
 echo "Passwords have been modified."
 echo
@@ -119,3 +106,4 @@
 
 rm /root/select.txt
 find /root -name TRANS.TBL -exec rm {} \;
+

Added: trunk/perfsonar-install-dvd/centos-5.5/desktop/setgeantbackground
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/setgeantbackground         
                  (rev 0)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/setgeantbackground   
2011-06-17 14:02:10 UTC (rev 5812)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Setting GN3 background launched after user login
+
+gconftool-2 --type string --set /desktop/gnome/background/primary_color 
"#ffffffffffff"
+gconftool-2 --type string --set /desktop/gnome/background/secondary_color 
"#ffffffffffff"
+gconftool-2 --type string --set /desktop/gnome/background/picture_filename 
/home/psuser/GEANT3-logo.gif
+gconftool-2 --type string --set /desktop/gnome/background/picture_options 
centered
+
+
+

Added: trunk/perfsonar-install-dvd/centos-5.5/java6-install.sh
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/java6-install.sh                   
          (rev 0)
+++ trunk/perfsonar-install-dvd/centos-5.5/java6-install.sh     2011-06-17 
14:02:10 UTC (rev 5812)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+LOGFILE=/root/perfSONAR.log
+
+echo ">>> Installing Sun Java6 <<<"
+echo
+
+exec 1>&6 6>&-
+
+clear
+dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 DVD for 
CentOS 5.5" \
+       --msgbox "\nThis will install the Sun Microsystems Java 
Platform.\nPlease, accept the license terms; otherwise, perfSONAR 
\ninstallation will not be fully operational." 8 60
+
+chmod 777 /root/perfSONAR/rpms/jdk-6u6-linux-i586-rpm.bin
+
+if /root/perfSONAR/rpms/jdk-6u6-linux-i586-rpm.bin; then
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/java-1.6.0-sun-compat-1.6.0.06-1jpp.i586.rpm
+       /usr/sbin/alternatives --set java /usr/lib/jvm/jre-1.6.0-sun/bin/java
+       dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
+               --infobox "\n           Java Installation finished." 5 60
+       sleep 3
+else
+       dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
+               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation." 10 60
+fi
+echo
+
+exec 6>&1
+exec >> $LOGFILE 2>&1
+
+echo "export JAVA_HOME=\"/usr/java/jdk1.6.0_06\"" >> /etc/profile.d/jdk.sh
+echo "export JRE_HOME=\"/usr/java/jdk1.6.0_06/jre\"" >> /etc/profile.d/jdk.sh
+chmod a+x /etc/profile.d/jdk.sh
+
+


Property changes on: trunk/perfsonar-install-dvd/centos-5.5/java6-install.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/perfsonar-install-dvd/centos-5.5/ks-desktop.cfg
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/ks-desktop.cfg       2011-03-15 
15:32:28 UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/ks-desktop.cfg       2011-06-17 
14:02:10 UTC (rev 5812)
@@ -66,8 +66,6 @@
 gdm
 httpd
 jpackage-utils
-mysql
-mysql-server
 net-snmp
 net-snmp-libs
 net-snmp-utils
@@ -80,11 +78,12 @@
 perl-Digest-SHA1
 perl-Digest-HMAC
 perl-Socket6
-tomcat5
-#yum-priorities
 expect
 dialog
 firefox
+mc
+createrepo
+libxslt
 
 # Post installation script
 #
@@ -95,11 +94,7 @@
 
 # General configuration
 #
-chroot /mnt/sysimage chkconfig sendmail off
 chroot /mnt/sysimage chkconfig ntpd on
-chroot /mnt/sysimage chkconfig tomcat5 on
-chroot /mnt/sysimage chkconfig httpd on
-chroot /mnt/sysimage chkconfig mysqld on
 
 # Copy perfSONAR data from installation media
 #

Modified: trunk/perfsonar-install-dvd/centos-5.5/ks.cfg
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/ks.cfg       2011-03-15 15:32:28 
UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/ks.cfg       2011-06-17 14:02:10 
UTC (rev 5812)
@@ -54,15 +54,14 @@
 @editors
 @core
 @base
-@base-x
+#@base-x
 gcc
 gcc-c++
 gd
 gd-devel
 httpd
+rsync
 jpackage-utils
-mysql
-mysql-server
 net-snmp
 net-snmp-libs
 net-snmp-utils
@@ -75,11 +74,13 @@
 perl-Digest-SHA1
 perl-Digest-HMAC
 perl-Socket6
-tomcat5
-#yum-priorities
 expect
 dialog
 lynx
+mc 
+createrepo
+yum-priorities
+libxslt
 
 # Post installation script
 #
@@ -90,11 +91,7 @@
 
 # General configuration
 #
-chroot /mnt/sysimage chkconfig sendmail off
 chroot /mnt/sysimage chkconfig ntpd on
-chroot /mnt/sysimage chkconfig tomcat5 on
-chroot /mnt/sysimage chkconfig httpd on
-chroot /mnt/sysimage chkconfig mysqld on
 
 # Copy perfSONAR data from installation media
 #

Added: trunk/perfsonar-install-dvd/centos-5.5/mysql-install.sh
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/mysql-install.sh                   
          (rev 0)
+++ trunk/perfsonar-install-dvd/centos-5.5/mysql-install.sh     2011-06-17 
14:02:10 UTC (rev 5812)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+LOGFILE=/root/perfSONAR.log
+
+exec 6>&1
+exec >> $LOGFILE 2>&1
+echo ">>> Installing MySql <<<"
+echo
+yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local install 
mysql-server
+echo
+chkconfig mysqld on
+echo
+
+


Property changes on: trunk/perfsonar-install-dvd/centos-5.5/mysql-install.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/perfsonar-install-dvd/centos-5.5/packages.txt
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/packages.txt 2011-03-15 15:32:28 
UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/packages.txt 2011-06-17 14:02:10 
UTC (rev 5812)
@@ -1,8 +1,46 @@
+alsa-lib-1.0.17-1.el5.i386.rpm
+ant-1.6.5-2jpp.2.i386.rpm
+ant-antlr-1.6.5-2jpp.2.i386.rpm
+antlr-2.7.6-4jpp.2.i386.rpm
+axis-1.2.1-2jpp.6.i386.rpm
+bcel-5.1-8jpp.1.i386.rpm
 bwctl-1.2a.tar.gz
+classpathx-jaf-1.0-9jpp.1.i386.rpm
+classpathx-mail-1.1.1-4jpp.2.i386.rpm
+eclipse-ecj-3.2.1-19.el5.centos.i386.rpm
 exist-1.2.6-1.noarch.rpm
+GEANT3-logo.gif
+geronimo-specs-1.0-0.M2.2jpp.12.el5.centos.i386.rpm
+geronimo-specs-compat-1.0-0.M2.2jpp.12.el5.centos.i386.rpm
+gjdoc-0.7.7-12.el5.i386.rpm
 iperf-2.0.2.tar.gz
+jakarta-commons-beanutils-1.7.0-5jpp.1.i386.rpm
+jakarta-commons-collections-3.2-2jpp.3.i386.rpm
+jakarta-commons-daemon-1.0.1-6jpp.1.i386.rpm
+jakarta-commons-dbcp-1.2.1-7jpp.1.i386.rpm
+jakarta-commons-digester-1.7-5jpp.1.i386.rpm
+jakarta-commons-discovery-0.3-4jpp.1.i386.rpm
+jakarta-commons-el-1.0-7jpp.1.i386.rpm
+jakarta-commons-fileupload-1.0-6jpp.1.i386.rpm
+jakarta-commons-httpclient-3.0-7jpp.1.i386.rpm
+jakarta-commons-launcher-0.9-6jpp.1.i386.rpm
+jakarta-commons-logging-1.0.4-6jpp.1.i386.rpm
+jakarta-commons-modeler-1.1-8jpp.3.el5.i386.rpm
+jakarta-commons-pool-1.3-5jpp.1.i386.rpm
+java-1.4.2-gcj-compat-1.4.2.0-40jpp.115.i386.rpm
+java-1.4.2-gcj-compat-devel-1.4.2.0-40jpp.115.i386.rpm
+java-1.6.0-openjdk-devel-1.6.0.0-1.7.b09.el5.i386.rpm
 java-1.6.0-sun-compat-1.6.0.06-1jpp.i586.rpm
 jdk-6u6-linux-i586-rpm.bin
+libart_lgpl-2.3.17-4.i386.rpm
+libgcj-4.1.2-48.el5.i386.rpm
+libgcj-devel-4.1.2-48.el5.i386.rpm
+libxslt-1.1.17-2.el5_2.2.i386.rpm
+libXtst-1.0.1-3.1.i386.rpm
+log4j-1.2.13-3jpp.2.i386.rpm
+mx4j-3.0.1-6jpp.4.i386.rpm
+mysql-5.0.77-4.el5_4.2.i386.rpm
+mysql-server-5.0.77-4.el5_4.2.i386.rpm
 mysql-sqlma-dbsetup.sql
 perfsonar-clmp-2.1-1.noarch.rpm
 perfsonar-java-as-1.3-1.noarch.rpm
@@ -10,12 +48,15 @@
 perfsonar-java-sql-ma-2.3-1.noarch.rpm
 perfsonar-java-sshtelnet-mp-1.4-4.noarch.rpm
 perfsonar-java-xml-ls-1.5-1.noarch.rpm
+perfsonar-mdm-local.repo
 perfsonar-mdm-stable.repo
 perfsonar-oppd-0.52-2.noarch.rpm
 perfsonar-oppd-mp-bwctl-0.52-2.noarch.rpm
 perfsonar-perl-e2emon-mp-1.2-0.noarch.rpm
 perl-Authen-SASL-2.14-1.el5.pp.noarch.rpm
 perl-Config-General-2.40-1.el5.noarch.rpm
+perl-DBD-MySQL-3.0007-2.el5.i386.rpm
+perl-DBI-1.52-2.el5.i386.rpm
 perl-Email-Date-Format-1.002-4.el5.noarch.rpm
 perl-GSSAPI-0.26-1.el5.rf.i386.rpm
 perl-HTTP-Daemon-SSL-1.04-1.el5.rf.noarch.rpm
@@ -42,9 +83,28 @@
 perl-XML-Parser-2.36-3.el5.pp.i386.rpm
 perl-XML-RegExp-0.03-2.el5.noarch.rpm
 perl-XML-Stream-1.22-1.el5.pp.noarch.rpm
+regexp-1.4-2jpp.2.i386.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
+struts-1.2.9-4jpp.5.i386.rpm
+tomcat5-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-admin-webapps-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-common-lib-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-jasper-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-jasper-javadoc-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-jsp-2.0-api-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-jsp-2.0-api-javadoc-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-server-lib-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-servlet-2.4-api-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-servlet-2.4-api-javadoc-5.5.23-0jpp.7.el5_3.2.i386.rpm
+tomcat5-webapps-5.5.23-0jpp.7.el5_3.2.i386.rpm
+wsdl4j-1.5.2-4jpp.1.i386.rpm
+xalan-j2-2.7.0-6jpp.1.i386.rpm
+xerces-j2-2.7.1-7jpp.2.el5_4.2.i386.rpm
+xml-commons-1.3.02-0.b2.7jpp.10.i386.rpm
+xml-commons-apis-1.3.02-0.b2.7jpp.10.i386.rpm
+xml-commons-resolver-1.1-1jpp.12.i386.rpm

Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2011-03-15 
15:32:28 UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2011-06-17 
14:02:10 UTC (rev 5812)
@@ -3,25 +3,6 @@
 LOGFILE=/root/perfSONAR.log
 
 clear
-dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 DVD for 
CentOS 5.5" \
-       --msgbox "\nThis will install the Sun Microsystems Java 
Platform.\nPlease, accept the license terms; otherwise, perfSONAR 
\ninstallation will not be fully operational." 8 60
-
-chmod 777 /root/perfSONAR/rpms/jdk-6u6-linux-i586-rpm.bin
-
-if /root/perfSONAR/rpms/jdk-6u6-linux-i586-rpm.bin; then
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/java-1.6.0-sun-compat-1.6.0.06-1jpp.i586.rpm
-       /usr/sbin/alternatives --set java /usr/lib/jvm/jre-1.6.0-sun/bin/java
-       /etc/init.d/tomcat5 restart
-       dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
-               --infobox "\n                Installation finished." 5 60
-       sleep 3
-else
-       dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for CentOS 5.5" \
-               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation." 10 60
-fi
-echo
-clear
-
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for CentOS 5.5" \
        --msgbox "\n       This will install the perfSONAR MDM 3.3" 6 60
 
@@ -43,6 +24,9 @@
        choice=$?
 done
 
+dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for CentOS 5.5" \
+       --infobox "\n            Installation in progress ..." 5 60
+
 select=$(cat /root/select.txt)
 
 exec 6>&1
@@ -51,16 +35,38 @@
 echo
 rpm -ivh --nosignature 
/root/perfSONAR/rpms/rpmforge-release-0.5.1-1.el5.rf.i386.rpm
 
+echo
 echo ">>> Configuring perfSONAR repositories <<<"
 echo
+mkdir -pv /repo/centos/5/os/i386/CentOS/RPMS
+cp /root/perfSONAR/rpms/*.rpm /repo/centos/5/os/i386/CentOS/RPMS/
+createrepo /repo/centos/5/os/i386/
+cp -vf /root/perfSONAR/rpms/perfsonar-mdm-local.repo /etc/yum.repos.d
 cp -vf /root/perfSONAR/rpms/perfsonar-mdm-stable.repo /etc/yum.repos.d
+echo
 
-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"
-EOF
-chmod a+x /etc/profile.d/jdk.sh
+if [[ $select == *1* ]] || [[ $select == *2* ]] || [[ $select == *3* ]] || 
[[ $select == *4* ]] || [[ $select == *6* ]]; then
+       echo ">>> Java6 installation required?: YES"
+       echo ">>> Tomcat5.5 installation required?: YES"
+       echo
+       /root/perfSONAR/scripts/java6-install.sh
+       /root/perfSONAR/scripts/tomcat-install.sh
+else
+       echo ">>> Java6 installation required?: NO"
+       echo ">>> Tomcat5.5 installation required?: NO"
+       echo
+fi
 echo
+
+if [[ $select == *4* ]]; then
+       echo ">>> MySql installation required?: YES"
+       echo
+       /root/perfSONAR/scripts/mysql-install.sh
+else
+       echo ">>> MySql installation required?: NO"
+       echo
+fi
+
 echo ">>> Configuring Lynx browser <<<"
 /root/perfSONAR/scripts/server/lynxconfig $select
 echo
@@ -73,8 +79,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Lookup Service <<<"
        echo
-       rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-xml-ls-1.5-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-xml-ls
        echo
 fi
 
@@ -86,7 +91,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Authentication Service <<<"
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-as-1.3-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-as
        echo
 fi
 
@@ -98,11 +103,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR RRD MA <<<"
        echo
-       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-rrd-ma-3.3.1-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-rrd-ma
        echo
 fi
 
@@ -115,12 +116,7 @@
        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 --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-1.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
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/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
 > /root/service.properties
@@ -148,34 +144,7 @@
        echo
        echo ">>> bwctl-1.2a software installed in /usr/lib/bwctl <<<"
        echo
-
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Config-General-2.40-1.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-IO-Tty-1.07-2.el5.kb.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-IPC-Run-0.80-3.el5.kb.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-IPC-Shareable-0.60-3.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MailTools-2.04-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Email-Date-Format-1.002-4.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MIME-Lite-3.023-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Mail-Sender-0.8.16-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Mail-Sendmail-0.79-9.el5.1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Params-Validate-0.91-1.el5.rf.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Sys-Syslog-0.27-2.el5.pp.i386.rpm
-       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-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
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-oppd-mp-bwctl-0.52-2.noarch.rpm
-
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/test.pl
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/finish.pl 
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/wizard.pl 
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/etc/oppd.conf
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/service.pl 
-#      chcon -t httpd_sys_content_t 
/usr/lib/perfsonar/services/oppd/geant2-perl-bwctl-mp/cgi-bin/logging.pl
-#      sed -i s/#AddHandler\ cgi-script\ .cgi/AddHandler\ cgi-script\ .cgi\ 
.pl/g /etc/httpd/conf/httpd.conf
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-oppd-mp-bwctl
        echo
 fi
 
@@ -187,8 +156,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Telnet/SSH MP <<<"
        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
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
install perfsonar-java-sshtelnet-mp
        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
@@ -202,22 +170,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR E2EMon MP <<<"
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MailTools-2.04-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Email-Date-Format-1.002-4.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-MIME-Lite-3.023-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-Parser-2.36-3.el5.pp.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-RegExp-0.03-2.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-GSSAPI-0.26-1.el5.rf.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Authen-SASL-2.14-1.el5.pp.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-Stream-1.22-1.el5.pp.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Net-XMPP-1.02-1.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Time-modules-2003.1126-4.el5.1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-Net-Jabber-2.0-10.el5.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-version-0.76-1.el5.pp.i386.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-XML-DOM-1.44-2.el5.rf.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perl-SOAP-Lite-0.710.08-1.el5.rf.noarch.rpm
-
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-perl-e2emon-mp-1.2-0.noarch.rpm
+       yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local 
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/perfsonar-perl-e2emon-mp-1.2-0/bin/start_e2e_mp_daemon.sh > /root/temp

Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1  2011-03-15 
15:32:28 UTC (rev 5811)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1  2011-06-17 
14:02:10 UTC (rev 5812)
@@ -6,12 +6,6 @@
 if [[ $select == *4* ]]; then
 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 MySQL user and the bwctl http user."
-#fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 on 
CentOS 5.5 Installation" \
        --msgbox "$OPTIONS" 7 60
@@ -67,13 +61,6 @@
 echo
 fi
 
-#if [[ $select == *5* ]]; then
-#echo ">>> Setting password for bwctl http user <<<"
-#echo
-#htpasswd -b -c /etc/httpd/conf/htusers bwctl \$PASSWD
-#echo
-#fi
-
 rm -f /etc/rc.d/rc3.d/S99postinstall1
 echo "Passwords have been modified."
 echo

Added: trunk/perfsonar-install-dvd/centos-5.5/tomcat-install.sh
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/tomcat-install.sh                  
          (rev 0)
+++ trunk/perfsonar-install-dvd/centos-5.5/tomcat-install.sh    2011-06-17 
14:02:10 UTC (rev 5812)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+LOGFILE=/root/perfSONAR.log
+
+exec 6>&1
+exec >> $LOGFILE 2>&1
+echo ">>> Installing Tomcat5 <<<"
+echo
+yum -y --noplugins --disablerepo=* --enablerepo=perfsonar-local install 
tomcat5
+echo
+chkconfig tomcat5 on
+echo
+
+


Property changes on: trunk/perfsonar-install-dvd/centos-5.5/tomcat-install.sh
___________________________________________________________________
Name: svn:executable
   + *