Skip to Content.
Sympa Menu

perfsonar-dev - [GEANT/SA2/ps-java-services] r5643 - in trunk/perfsonar-install-dvd: CentOS-5.4 CentOS-5.4/desktop CentOS-5.4/server Debian-5.0 Debian-5.0/desktop Debian-5.0/server

Subject: perfsonar development work

List archive

[GEANT/SA2/ps-java-services] r5643 - in trunk/perfsonar-install-dvd: CentOS-5.4 CentOS-5.4/desktop CentOS-5.4/server Debian-5.0 Debian-5.0/desktop Debian-5.0/server


Chronological Thread 
  • From:
  • To:
  • Subject: [GEANT/SA2/ps-java-services] r5643 - in trunk/perfsonar-install-dvd: CentOS-5.4 CentOS-5.4/desktop CentOS-5.4/server Debian-5.0 Debian-5.0/desktop Debian-5.0/server
  • Date: Fri, 14 May 2010 13:38:22 +0100
Author: psnc.lopatowski
Date: 2010-05-14 13:38:22 +0100 (Fri, 14 May 2010)
New Revision: 5643

Modified:
trunk/perfsonar-install-dvd/CentOS-5.4/desktop/firefoxconfig
trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall1
trunk/perfsonar-install-dvd/CentOS-5.4/ks-desktop.cfg
trunk/perfsonar-install-dvd/CentOS-5.4/ks.cfg
trunk/perfsonar-install-dvd/CentOS-5.4/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/preseed-desktop.cfg
trunk/perfsonar-install-dvd/Debian-5.0/preseed.cfg
trunk/perfsonar-install-dvd/Debian-5.0/server/lynxconfig
trunk/perfsonar-install-dvd/Debian-5.0/server/postinstall0
Log:


Modified: trunk/perfsonar-install-dvd/CentOS-5.4/desktop/firefoxconfig
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/desktop/firefoxconfig
2010-05-14 11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/desktop/firefoxconfig
2010-05-14 12:38:22 UTC (rev 5643)
@@ -2,11 +2,11 @@

# Configuring autostart mechanism

-echo "firefox /home/user/perf.html &" >> /etc/X11/xinit/xinitrc-common
+echo "firefox /home/psuser/perf.html &" >> /etc/X11/xinit/xinitrc-common

# Creating Firefox home page with links to installed pS services

-htmlfile=/home/user/perf.html
+htmlfile=/home/psuser/perf.html
touch $htmlfile

echo "<html>" >> $htmlfile

Modified: trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall1 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall1 2010-05-14
12:38:22 UTC (rev 5643)
@@ -1,7 +1,7 @@
#!/bin/bash

dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 on
CentOS 5.4 Installation" \
- --msgbox "\n This will change the password for the user system \n
account." 8 60
+ --msgbox "\n This will change the password for the psuser system \n
account." 8 60

select=$(cat /root/select.txt)

@@ -87,9 +87,9 @@
echo
echo $PASSWD | passwd --stdin root
echo
-echo ">>> Setting password for user <<<"
+echo ">>> Setting password for psuser <<<"
echo
-echo $UPASSWD | passwd --stdin user
+echo $UPASSWD | passwd --stdin psuser
echo

if [[ $select == *4* ]]; then

Modified: trunk/perfsonar-install-dvd/CentOS-5.4/ks-desktop.cfg
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/ks-desktop.cfg 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/ks-desktop.cfg 2010-05-14
12:38:22 UTC (rev 5643)
@@ -26,7 +26,7 @@
# Security configuration
#
#rootpw --iscrypted $1$NoXQ6dS7$UjQkOxuHU4OXwNUHY2JRi0
-rootpw macka
+rootpw pspassword
auth --useshadow --enablemd5
#firewall --enabled --ssh
firewall --disabled
@@ -114,7 +114,7 @@
chroot /mnt/sysimage chmod +x /root/perfSONAR/scripts/desktop/firefoxconfig

echo ">>> Creating user account <<<"
-chroot /mnt/sysimage /usr/sbin/useradd -m user
+chroot /mnt/sysimage /usr/sbin/useradd -m psuser
echo
echo ">>> POST-INSTALLATION END <<<"
echo

Modified: trunk/perfsonar-install-dvd/CentOS-5.4/ks.cfg
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/ks.cfg 2010-05-14 11:20:20
UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/ks.cfg 2010-05-14 12:38:22
UTC (rev 5643)
@@ -27,7 +27,7 @@
# Security configuration
#
#rootpw --iscrypted $1$NoXQ6dS7$UjQkOxuHU4OXwNUHY2JRi0
-rootpw macka
+rootpw pspassword
auth --useshadow --enablemd5
#firewall --enabled --ssh
firewall --disabled

Modified: trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0 2010-05-14
12:38:22 UTC (rev 5643)
@@ -70,11 +70,6 @@
echo
rpm -ivh --nosignature
/root/perfSONAR/rpms/tomcat5-exist-1.2.3-1.noarch.rpm
rpm -ivh --nosignature
/root/perfSONAR/rpms/geant2-java-xml-ls-1.3-12.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-xml-ls/WEB-INF/lib/xercesImpl-2.8.0.jar
/var/lib/tomcat5/common/endorsed
echo
fi

@@ -87,10 +82,6 @@
echo ">>> Installing perfSONAR Authentication Service <<<"
echo
rpm -ivh --nosignature
/root/perfSONAR/rpms/geant2-java-as-1.1-1.noarch.rpm
- cp -vf
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/lib/xalan-2.7.0.jar
/var/lib/tomcat5/common/endorsed
- cp -vf
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/lib/xalan-serializer-2.7.0.jar
/var/lib/tomcat5/common/endorsed
- cp -vf
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/lib/xercesImpl-2.8.0.jar
/var/lib/tomcat5/common/endorsed
- cp -vf
/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/lib/xerces-xml-apis-2.8.0.jar
/var/lib/tomcat5/common/endorsed
echo
fi

@@ -106,11 +97,6 @@
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/geant2-java-rrd-ma-3.1.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-rrd-ma/WEB-INF/lib/xercesImpl-2.8.0.jar
/var/lib/tomcat5/common/endorsed
echo
fi

@@ -125,11 +111,6 @@
/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
echo
fi

@@ -186,11 +167,6 @@
echo ">>> Installing perfSONAR Telnet/SSH MP <<<"
echo
rpm -ivh /root/perfSONAR/rpms/ps-mdm-sshtelnet-mp-1.3.4-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/ps-mdm-sshtelnet-mp/WEB-INF/lib/xercesImpl-2.8.0.jar
/var/lib/tomcat5/common/endorsed
echo
fi


Modified: trunk/perfsonar-install-dvd/Debian-5.0/desktop/iceweaselautorun
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/desktop/iceweaselautorun
2010-05-14 11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/desktop/iceweaselautorun
2010-05-14 12:38:22 UTC (rev 5643)
@@ -2,4 +2,4 @@

# Iceweasel autorun script launched after user login

-iceweasel /home/user/perf.html &
+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-05-14 11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/desktop/iceweaselconfig
2010-05-14 12:38:22 UTC (rev 5643)
@@ -7,7 +7,7 @@

# Creating Iceweasel home page with links to installed pS services

-htmlfile=/home/user/perf.html
+htmlfile=/home/psuser/perf.html
touch $htmlfile

echo "<html>" >> $htmlfile
@@ -23,15 +23,15 @@
fi

if [[ $* == *2* ]]; then
- echo "<p> <b>Authentication Service</b> (<a
href=\"http://localhost:8180/geant2-java-as\";>link</a>) </p>" >> $htmlfile
+ echo "<p> <b>Authentication Service</b> (<a
href=\"http://localhost:8180/perfsonar-java-as\";>link</a>) </p>" >> $htmlfile
fi

if [[ $* == *3* ]]; then
- echo "<p> <b>RRD MA</b> (<a
href=\"http://localhost:8180/geant2-java-rrd-ma\";>link</a>) </p>" >> $htmlfile
+ echo "<p> <b>RRD MA</b> (<a
href=\"http://localhost:8180/perfsonar-java-rrd-ma\";>link</a>) </p>" >>
$htmlfile
fi

if [[ $* == *4* ]]; then
- echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/geant2-java-sql-ma\";>link</a>) </p>" >> $htmlfile
+ echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/perfsonar-java-sql-ma\";>link</a>) </p>" >>
$htmlfile
fi

if [[ $* == *5* ]]; then

Modified: trunk/perfsonar-install-dvd/Debian-5.0/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/desktop/postinstall0 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/desktop/postinstall0 2010-05-14
12:38:22 UTC (rev 5643)
@@ -5,7 +5,7 @@
dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 on Debian
5.0 Installation" \
--msgbox "\nThis will install the Sun Microsystems Java
Platform.\nPlease, accept the license terms; otherwise, perfSONAR
\ninstallation will not be fully operational." 8 60

-apt-get -y install sun-java6-jdk
+apt-get -y install sun-java6-jre
echo

dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM
3.3 on Debian 5.0 Installation" \
@@ -56,12 +56,16 @@
echo ">>> Configuring Iceweasel browser <<<"
/root/perfSONAR/scripts/desktop/iceweaselconfig $select
echo
+echo ">>> Setting JAVA_HOME varible <<<"
+echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun-1.6.0.12"' | tee -a /etc/environment
+echo
echo ">>> Installing tomcat5.5 <<<"
apt-get -y install tomcat5.5
echo
echo ">>> Changing Tomcat security to NO <<<"
sed -e 's/#TOMCAT5_SECURITY=yes/TOMCAT5_SECURITY=no/' /etc/default/tomcat5.5
> /root/tomcat5.5
-mv /root/tomcat5.5 /etc/default/tomcat5.5
+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

if [[ $select == *1* ]]; then
@@ -83,6 +87,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR AS <<<"
+ echo
apt-get -y install perfsonar-java-as
echo
fi
@@ -94,6 +99,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR RRD MA <<<"
+ echo
apt-get -y install perfsonar-java-rrd-ma
echo
fi
@@ -105,6 +111,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR SQL MA <<<"
+ echo
apt-get -y install perfsonar-java-sql-ma
echo
fi
@@ -116,6 +123,23 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR BWCTL MP <<<"
+ echo
+ echo "Installing iperf"
+ dpkg -i /root/perfSONAR/debs/iperf_2.0.2-2_i386.deb
+ echo
+ echo "Installing bwctl"
+ cd /root
+ tar -zxf /root/perfSONAR/debs/bwctl-1.3.tar.gz
+ cd /root/bwctl-1.3/
+ ./configure && make && make install
+ apt-get -y install libhttp-daemon-ssl-perl
+ apt-get -y install libconfig-general-perl
+ apt-get -y install libipc-shareable-perl
+ apt-get -y install perfsonar-oppd-mp-bwctl
+ apt-get -y install perfsonar-oppd-WebAdmin
+ echo
+ echo AddHandler cgi-script .cgi .pl >> /etc/apache2/apache2.conf
+ echo
fi

if [[ $select == *6* ]]; then
@@ -125,6 +149,9 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR Telnet/SSH MP <<<"
+ echo
+ apt-get -y install perfsonar-java-sshtelnet-mp
+ echo
fi

if [[ $select == *7* ]]; then
@@ -134,6 +161,9 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR E2EMon MP <<<"
+ echo
+ apt-get -y install perfsonar-perl-e2emon-mp
+ echo
fi

rm -f /etc/rc2.d/S24postinstall0

Modified: trunk/perfsonar-install-dvd/Debian-5.0/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/desktop/postinstall1 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/desktop/postinstall1 2010-05-14
12:38:22 UTC (rev 5643)
@@ -1,7 +1,7 @@
#!/bin/bash

dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 on
Debian 5.0 Installation" \
- --msgbox "\n This will change the password for the user system \n
account." 8 60
+ --msgbox "\n This will change the password for the psuser system \n
account." 8 60

select=$(cat /root/select.txt)

@@ -83,9 +83,9 @@
echo
echo ">>> SETTING PASSWORDS <<<"
echo
-echo ">>> Setting password for user <<<"
+echo ">>> Setting password for psuser <<<"
echo
-/root/perfSONAR/scripts/desktop/chrootpass "user" $UPASSWD
+/root/perfSONAR/scripts/desktop/chrootpass "psuser" $UPASSWD
echo
echo ">>> Setting password for root <<<"
echo

Modified: trunk/perfsonar-install-dvd/Debian-5.0/preseed-desktop.cfg
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/preseed-desktop.cfg 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/preseed-desktop.cfg 2010-05-14
12:38:22 UTC (rev 5643)
@@ -30,12 +30,12 @@
d-i partman/confirm boolean true

### Passwords
-d-i passwd/user-fullname string perfSONAR User
-d-i passwd/username string user
-d-i passwd/user-password password psonar
-d-i passwd/user-password-again password psonar
-d-i passwd/root-password password psonar
-d-i passwd/root-password-again password psonar
+d-i passwd/user-fullname string perfSONAR MDM User
+d-i passwd/username string psuser
+d-i passwd/user-password password pspassword
+d-i passwd/user-password-again password pspassword
+d-i passwd/root-password password pspassword
+d-i passwd/root-password-again password pspassword

### Apt setup
d-i cdrom-checker/nextcd boolean false

Modified: trunk/perfsonar-install-dvd/Debian-5.0/preseed.cfg
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/preseed.cfg 2010-05-14 11:20:20
UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/preseed.cfg 2010-05-14 12:38:22
UTC (rev 5643)
@@ -31,8 +31,8 @@

### Passwords
d-i passwd/make-user boolean false
-d-i passwd/root-password password psonar
-d-i passwd/root-password-again password psonar
+d-i passwd/root-password password pspassword
+d-i passwd/root-password-again password pspassword

### Apt setup
d-i cdrom-checker/nextcd boolean false

Modified: trunk/perfsonar-install-dvd/Debian-5.0/server/lynxconfig
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/server/lynxconfig 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/server/lynxconfig 2010-05-14
12:38:22 UTC (rev 5643)
@@ -28,15 +28,15 @@
fi

if [[ $* == *2* ]]; then
- echo "<p> <b>Authentication Service</b> (<a
href=\"http://localhost:8180/geant2-java-as\";>link</a>) </p>" >> $htmlfile
+ echo "<p> <b>Authentication Service</b> (<a
href=\"http://localhost:8180/perfsonar-java-as\";>link</a>) </p>" >> $htmlfile
fi

if [[ $* == *3* ]]; then
- echo "<p> <b>RRD MA</b> (<a
href=\"http://localhost:8180/geant2-java-rrd-ma\";>link</a>) </p>" >> $htmlfile
+ echo "<p> <b>RRD MA</b> (<a
href=\"http://localhost:8180/perfsonar-java-rrd-ma\";>link</a>) </p>" >>
$htmlfile
fi

if [[ $* == *4* ]]; then
- echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/geant2-java-sql-ma\";>link</a>) </p>" >> $htmlfile
+ echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/perfsonar-java-sql-ma\";>link</a>) </p>" >>
$htmlfile
fi

if [[ $* == *5* ]]; then

Modified: trunk/perfsonar-install-dvd/Debian-5.0/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/Debian-5.0/server/postinstall0 2010-05-14
11:20:20 UTC (rev 5642)
+++ trunk/perfsonar-install-dvd/Debian-5.0/server/postinstall0 2010-05-14
12:38:22 UTC (rev 5643)
@@ -5,7 +5,7 @@
dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 on Debian
5.0 Installation" \
--msgbox "\nThis will install the Sun Microsystems Java
Platform.\nPlease, accept the license terms; otherwise, perfSONAR
\ninstallation will not be fully operational." 9 60

-apt-get -y install sun-java6-jdk
+apt-get -y install sun-java6-jre
echo

dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM
3.3 on Debian 5.0 Installation" \
@@ -56,12 +56,16 @@
echo ">>> Configuring Lynx browser <<<"
/root/perfSONAR/scripts/server/lynxconfig $select
echo
+echo ">>> Setting JAVA_HOME varible <<<"
+echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun-1.6.0.12"' | tee -a /etc/environment
+echo
echo ">>> Installing tomcat5.5 <<<"
apt-get -y install tomcat5.5
echo
echo ">>> Changing Tomcat security to NO <<<"
sed -e 's/#TOMCAT5_SECURITY=yes/TOMCAT5_SECURITY=no/' /etc/default/tomcat5.5
> /root/tomcat5.5
-mv /root/tomcat5.5 /etc/default/tomcat5.5
+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

if [[ $select == *1* ]]; then
@@ -74,11 +78,6 @@
echo
apt-get -y install perfsonar-java-xml-ls
echo
-
- echo ">>> Restarting Tomcat <<<"
- /etc/init.d/tomcat5.5 stop
- /etc/init.d/tomcat5.5 start
- echo
fi

if [[ $select == *2* ]]; then
@@ -88,6 +87,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR AS <<<"
+ echo
apt-get -y install perfsonar-java-as
echo
fi
@@ -99,6 +99,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR RRD MA <<<"
+ echo
apt-get -y install perfsonar-java-rrd-ma
echo
fi
@@ -110,7 +111,14 @@
exec 6>&1
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
+ echo
fi

if [[ $select == *5* ]]; then
@@ -120,6 +128,23 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR BWCTL MP <<<"
+ echo
+ echo "Installing iperf"
+ dpkg -i /root/perfSONAR/debs/iperf_2.0.2-2_i386.deb
+ echo
+ echo "Installing bwctl"
+ cd /root
+ tar -zxf /root/perfSONAR/debs/bwctl-1.3.tar.gz
+ cd /root/bwctl-1.3/
+ ./configure && make && make install
+ apt-get -y install libhttp-daemon-ssl-perl
+ apt-get -y install libconfig-general-perl
+ apt-get -y install libipc-shareable-perl
+ apt-get -y install perfsonar-oppd-mp-bwctl
+ apt-get -y install perfsonar-oppd-WebAdmin
+ echo
+ echo AddHandler cgi-script .cgi .pl >> /etc/apache2/apache2.conf
+ echo
fi

if [[ $select == *6* ]]; then
@@ -129,6 +154,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR Telnet/SSH MP <<<"
+ echo
apt-get -y install perfsonar-java-sshtelnet-mp
echo
fi
@@ -140,6 +166,7 @@
exec 6>&1
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR E2EMon MP <<<"
+ echo
apt-get -y install perfsonar-perl-e2emon-mp
echo
fi


  • [GEANT/SA2/ps-java-services] r5643 - in trunk/perfsonar-install-dvd: CentOS-5.4 CentOS-5.4/desktop CentOS-5.4/server Debian-5.0 Debian-5.0/desktop Debian-5.0/server, svn-noreply, 05/14/2010

Archive powered by MHonArc 2.6.16.

Top of Page