perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5759 - in trunk/perfsonar-install-dvd: centos-5.5/desktop centos-5.5/server debian-5.0/desktop debian-5.0/server
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r5759 - in trunk/perfsonar-install-dvd: centos-5.5/desktop centos-5.5/server debian-5.0/desktop debian-5.0/server
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5759 - in trunk/perfsonar-install-dvd: centos-5.5/desktop centos-5.5/server debian-5.0/desktop debian-5.0/server
- Date: Fri, 1 Oct 2010 11:23:17 +0100
Author: psnc.lopatowski
Date: 2010-10-01 11:23:16 +0100 (Fri, 01 Oct 2010)
New Revision: 5759
Modified:
trunk/perfsonar-install-dvd/centos-5.5/desktop/firefoxconfig
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/server/lynxconfig
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/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/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/firefoxconfig
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/firefoxconfig
2010-09-29 09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/firefoxconfig
2010-10-01 10:23:16 UTC (rev 5759)
@@ -30,13 +30,17 @@
fi
if [[ $* == *4* ]]; then
- echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8080/perfsonar-java-sql-ma\">link</a>) </p>" >>
$htmlfile
+ echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8080/geant2-java-sql-ma\">link</a>) </p>" >> $htmlfile
fi
if [[ $* == *5* ]]; then
- echo "<p> <b>BWCTL MP</b> (<a href=\"http://localhost/\">link</a>)
</p>" >> $htmlfile
+ echo "<p> <b>BWCTL MP</b> </p>" >> $htmlfile
fi
+#if [[ $* == *5* ]]; then
+# echo "<p> <b>BWCTL MP</b> (<a href=\"http://localhost/\">link</a>)
</p>" >> $htmlfile
+#fi
+
if [[ $* == *6* ]]; then
echo "<p> <b>Telnet/SSH MP</b> (<a
href=\"http://localhost:8080/perfsonar-java-sshtelnet-mp\">link</a>) </p>" >>
$htmlfile
fi
Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-10-01
10:23:16 UTC (rev 5759)
@@ -126,10 +126,19 @@
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR BWCTL MP <<<"
echo
- sh -c "cd /root/perfSONAR/rpms && tar xvzf iperf-2.0.2.tar.gz"
- sh -c "cd /root/perfSONAR/rpms/iperf-2.0.2 && ./configure && make &&
make install"
- sh -c "cd /root/perfSONAR/rpms && tar xvzf bwctl-1.2a.tar.gz"
- sh -c "cd /root/perfSONAR/rpms/bwctl-1.2a && ./configure
--prefix=/usr/lib/bwctl && make && make install"
+ sh -c "cp /root/perfSONAR/rpms/iperf-2.0.2.tar.gz /root/"
+ sh -c "cd /root && tar xvzf iperf-2.0.2.tar.gz"
+ sh -c "cd /root/iperf-2.0.2 && ./configure --prefix=/usr/lib/iperf &&
make && make install"
+ echo
+ echo ">>> iperf-2.0.2 software installed in /usr/lib/iperf <<<"
+ echo
+ sh -c "cp /root/perfSONAR/rpms/bwctl-1.2a.tar.gz /root/"
+ sh -c "cd /root && tar xvzf bwctl-1.2a.tar.gz"
+ sh -c "cd /root/bwctl-1.2a && ./configure --prefix=/usr/lib/bwctl &&
make && make install"
+ 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
@@ -144,7 +153,11 @@
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-HTTP-Daemon-SSL-1.04-1.el5.rf.noarch.rpm
+ rpm -ivh --nosignature
/root/perfSONAR/rpms/perfsonar-oppd-0.52-rc1.noarch.rpm
+ rpm -ivh --nosignature
/root/perfSONAR/rpms/perfsonar-oppd-mp-bwctl-0.52-rc1.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
@@ -152,17 +165,7 @@
# 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
-
- rpm -ivh --nosignature
/root/perfSONAR/rpms/perl-NMWG-0.02-rc1.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-rc1.noarch.rpm
- rpm -ivh --nosignature
/root/perfSONAR/rpms/perfsonar-oppd-mp-bwctl-0.52-rc1.noarch.rpm
-
-# chmod 666 /usr/lib/perfsonar/services/oppd/etc/oppd.conf
-# chmod 666 /etc/oppd.conf
-
- sed -i s/#AddHandler\ cgi-script\ .cgi/AddHandler\ cgi-script\ .cgi\
.pl/g /etc/httpd/conf/httpd.conf
+# sed -i s/#AddHandler\ cgi-script\ .cgi/AddHandler\ cgi-script\ .cgi\
.pl/g /etc/httpd/conf/httpd.conf
echo
fi
@@ -211,5 +214,6 @@
fi
rm -f /etc/rc.d/rc5.d/S000postinstall0
+echo
echo ">>> perfSONAR MDM 3.3 INSTALLATION FINISHED <<<"
echo
Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall1 2010-10-01
10:23:16 UTC (rev 5759)
@@ -36,15 +36,15 @@
if [[ $select == *4* ]]; then
OPTIONS="\nThis will change the passwords for the root system user \nand the
root and perfsonar_ma MySQL users."
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."
-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."
+#fi
dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD
for CentOS 5.5" \
- --msgbox "$OPTIONS" 8 60
+ --msgbox "$OPTIONS" 7 60
PASSWD=pass1
PASSWD2=pass2
@@ -103,12 +103,12 @@
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
+#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."
Modified: trunk/perfsonar-install-dvd/centos-5.5/server/lynxconfig
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/lynxconfig 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/lynxconfig 2010-10-01
10:23:16 UTC (rev 5759)
@@ -36,13 +36,17 @@
fi
if [[ $* == *4* ]]; then
- echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8080/perfsonar-java-sql-ma\">link</a>) </p>" >>
$htmlfile
+ echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8080/geant2-java-sql-ma\">link</a>) </p>" >> $htmlfile
fi
if [[ $* == *5* ]]; then
- echo "<p> <b>BWCTL MP</b> (<a href=\"http://localhost/\">link</a>)
</p>" >> $htmlfile
+ echo "<p> <b>BWCTL MP</b> </p>" >> $htmlfile
fi
+#if [[ $* == *5* ]]; then
+# echo "<p> <b>BWCTL MP</b> (<a href=\"http://localhost/\">link</a>)
</p>" >> $htmlfile
+#fi
+
if [[ $* == *6* ]]; then
echo "<p> <b>Telnet/SSH MP</b> (<a
href=\"http://localhost:8080/perfsonar-java-sshtelnet-mp\">link</a>) </p>" >>
$htmlfile
fi
Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0 2010-10-01
10:23:16 UTC (rev 5759)
@@ -128,10 +128,19 @@
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR BWCTL MP <<<"
echo
- sh -c "cd /root/perfSONAR/rpms && tar xvzf iperf-2.0.2.tar.gz"
- sh -c "cd /root/perfSONAR/rpms/iperf-2.0.2 && ./configure && make &&
make install"
- sh -c "cd /root/perfSONAR/rpms && tar xvzf bwctl-1.2a.tar.gz"
- sh -c "cd /root/perfSONAR/rpms/bwctl-1.2a && ./configure
--prefix=/usr/lib/bwctl && make && make install"
+ sh -c "cp /root/perfSONAR/rpms/iperf-2.0.2.tar.gz /root/"
+ sh -c "cd /root && tar xvzf iperf-2.0.2.tar.gz"
+ sh -c "cd /root/iperf-2.0.2 && ./configure --prefix=/usr/lib/iperf &&
make && make install"
+ echo
+ echo ">>> iperf-2.0.2 software installed in /usr/lib/iperf <<<"
+ echo
+ sh -c "cp /root/perfSONAR/rpms/bwctl-1.2a.tar.gz /root/"
+ sh -c "cd /root && tar xvzf bwctl-1.2a.tar.gz"
+ sh -c "cd /root/bwctl-1.2a && ./configure --prefix=/usr/lib/bwctl &&
make && make install"
+ 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
@@ -146,7 +155,11 @@
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-HTTP-Daemon-SSL-1.04-1.el5.rf.noarch.rpm
+ rpm -ivh --nosignature
/root/perfSONAR/rpms/perfsonar-oppd-0.52-rc1.noarch.rpm
+ rpm -ivh --nosignature
/root/perfSONAR/rpms/perfsonar-oppd-mp-bwctl-0.52-rc1.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
@@ -154,17 +167,7 @@
# 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
-
- rpm -ivh --nosignature
/root/perfSONAR/rpms/perl-NMWG-0.02-rc1.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-rc1.noarch.rpm
- rpm -ivh --nosignature
/root/perfSONAR/rpms/perfsonar-oppd-mp-bwctl-0.52-rc1.noarch.rpm
-
-# chmod 666 /usr/lib/perfsonar/services/oppd/etc/oppd.conf
-# chmod 666 /etc/oppd.conf
-
- sed -i s/#AddHandler\ cgi-script\ .cgi/AddHandler\ cgi-script\ .cgi\
.pl/g /etc/httpd/conf/httpd.conf
+# sed -i s/#AddHandler\ cgi-script\ .cgi/AddHandler\ cgi-script\ .cgi\
.pl/g /etc/httpd/conf/httpd.conf
echo
fi
@@ -213,5 +216,6 @@
fi
rm -f /etc/rc3.d/S98postinstall0
+echo
echo ">>> perfSONAR MDM 3.3 INSTALLATION FINISHED <<<"
echo
Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall1 2010-10-01
10:23:16 UTC (rev 5759)
@@ -6,12 +6,12 @@
if [[ $select == *4* ]]; then
OPTIONS="\nThis will change the passwords for the root system user \nand the
root and perfsonar_ma MySQL users."
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."
-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."
+#fi
dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 on
CentOS 5.5 Installation" \
--msgbox "$OPTIONS" 7 60
@@ -70,12 +70,12 @@
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
+#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."
Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
2010-09-29 09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
2010-10-01 10:23:16 UTC (rev 5759)
@@ -31,13 +31,17 @@
fi
if [[ $* == *4* ]]; then
- echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/perfsonar-java-sql-ma\">link</a>) </p>" >>
$htmlfile
+ echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/geant2-java-sql-ma\">link</a>) </p>" >> $htmlfile
fi
if [[ $* == *5* ]]; then
- echo "<p> <b>BWCTL MP</b> (<a
href=\"http://localhost/geant2-perl-bwctl-mp/index.html\">link</a>) </p>" >>
$htmlfile
+ echo "<p> <b>BWCTL MP</b> </p>" >> $htmlfile
fi
+#if [[ $* == *5* ]]; then
+# echo "<p> <b>BWCTL MP</b> (<a
href=\"http://localhost/geant2-perl-bwctl-mp/index.html\">link</a>) </p>" >>
$htmlfile
+#fi
+
if [[ $* == *6* ]]; then
echo "<p> <b>Telnet/SSH MP</b> (<a
href=\"http://localhost:8180/perfsonar-java-sshtelnet-mp\">link</a>) </p>" >>
$htmlfile
fi
Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-10-01
10:23:16 UTC (rev 5759)
@@ -135,24 +135,27 @@
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR BWCTL MP <<<"
echo
- echo "Installing iperf"
+ echo ">>> Installing iperf (version 2.0.2) <<<"
dpkg -i /root/perfSONAR/debs/iperf_2.0.2-2_i386.deb
echo
- echo "Installing bwctl"
+ echo ">>> Installing bwctl <<<"
cd /root
- tar -zxf /root/perfSONAR/debs/bwctl-1.3.tar.gz
- cd /root/bwctl-1.3/
- ./configure && make && make install
+ tar -zxf /root/perfSONAR/debs/bwctl-1.2a.tar.gz
+ cd /root/bwctl-1.2a/
+ ./configure --prefix=/usr/lib/bwctl && make && make install
+ echo
+ echo ">>> bwctl-1.2a software installed in /usr/lib/bwctl <<<"
+ echo
+
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 libipc-run-perl
- apt-get -y install perfsonar-oppd
apt-get -y install perfsonar-oppd-mp-bwctl
echo
- echo AddHandler cgi-script .cgi .pl >> /etc/apache2/apache2.conf
- echo
+
+# echo AddHandler cgi-script .cgi .pl >> /etc/apache2/apache2.conf
fi
if [[ $select == *6* ]]; then
Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2010-10-01
10:23:16 UTC (rev 5759)
@@ -36,12 +36,12 @@
if [[ $select == *4* ]]; then
OPTIONS="\nThis will change the passwords for the root system user \nand the
root and perfsonar_ma MySQL users."
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."
-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."
+#fi
dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD
for Debian 5" \
--msgbox "$OPTIONS" 8 60
@@ -99,12 +99,12 @@
echo
fi
-if [[ $select == *5* ]]; then
-echo ">>> Setting password for bwctl http user <<<"
-echo
-/root/perfSONAR/scripts/desktop/chbwctlpass $PASSWD
-echo
-fi
+#if [[ $select == *5* ]]; then
+#echo ">>> Setting password for bwctl http user <<<"
+#echo
+#/root/perfSONAR/scripts/desktop/chbwctlpass $PASSWD
+#echo
+#fi
rm -f /etc/rc2.d/S25postinstall1
echo "Passwords have been modified."
Modified: trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/lynxconfig 2010-10-01
10:23:16 UTC (rev 5759)
@@ -36,13 +36,17 @@
fi
if [[ $* == *4* ]]; then
- echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/perfsonar-java-sql-ma\">link</a>) </p>" >>
$htmlfile
+ echo "<p> <b>SQL MA</b> (<a
href=\"http://localhost:8180/geant2-java-sql-ma\">link</a>) </p>" >> $htmlfile
fi
if [[ $* == *5* ]]; then
- echo "<p> <b>BWCTL MP</b> (<a
href=\"http://localhost/geant2-perl-bwctl-mp/index.html\">link</a>) </p>" >>
$htmlfile
+ echo "<p> <b>BWCTL MP</b> </p>" >> $htmlfile
fi
+#if [[ $* == *5* ]]; then
+# echo "<p> <b>BWCTL MP</b> (<a
href=\"http://localhost/geant2-perl-bwctl-mp/index.html\">link</a>) </p>" >>
$htmlfile
+#fi
+
if [[ $* == *6* ]]; then
echo "<p> <b>Telnet/SSH MP</b> (<a
href=\"http://localhost:8180/perfsonar-java-sshtelnet-mp\">link</a>) </p>" >>
$htmlfile
fi
Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0 2010-10-01
10:23:16 UTC (rev 5759)
@@ -136,24 +136,27 @@
exec >> $LOGFILE 2>&1
echo ">>> Installing perfSONAR BWCTL MP <<<"
echo
- echo "Installing iperf"
+ echo ">>> Installing iperf (version 2.0.2) <<<"
dpkg -i /root/perfSONAR/debs/iperf_2.0.2-2_i386.deb
echo
- echo "Installing bwctl"
+ echo ">>> Installing bwctl <<<"
cd /root
- tar -zxf /root/perfSONAR/debs/bwctl-1.3.tar.gz
- cd /root/bwctl-1.3/
- ./configure && make && make install
+ tar -zxf /root/perfSONAR/debs/bwctl-1.2a.tar.gz
+ cd /root/bwctl-1.2a/
+ ./configure --prefix=/usr/lib/bwctl && make && make install
+ echo
+ echo ">>> bwctl-1.2a software installed in /usr/lib/bwctl <<<"
+ echo
+
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 libipc-run-perl
- apt-get -y install perfsonar-oppd
apt-get -y install perfsonar-oppd-mp-bwctl
echo
- echo AddHandler cgi-script .cgi .pl >> /etc/apache2/apache2.conf
- echo
+
+# echo AddHandler cgi-script .cgi .pl >> /etc/apache2/apache2.conf
fi
if [[ $select == *6* ]]; then
Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1 2010-09-29
09:45:36 UTC (rev 5758)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1 2010-10-01
10:23:16 UTC (rev 5759)
@@ -6,12 +6,12 @@
if [[ $select == *4* ]]; then
OPTIONS="\nThis will change the passwords for the root system user \nand the
root and perfsonar_ma MySQL users."
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."
-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."
+#fi
dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD
for Debian 5" \
--msgbox "$OPTIONS" 8 60
@@ -66,12 +66,12 @@
echo
fi
-if [[ $select == *5* ]]; then
-echo ">>> Setting password for bwctl http user <<<"
-echo
-/root/perfSONAR/scripts/server/chbwctlpass $PASSWD
-echo
-fi
+#if [[ $select == *5* ]]; then
+#echo ">>> Setting password for bwctl http user <<<"
+#echo
+#/root/perfSONAR/scripts/server/chbwctlpass $PASSWD
+#echo
+#fi
rm -f /etc/rc2.d/S99postinstall1
echo "Passwords have been modified."
- [pS-dev] [GEANT/SA2/ps-java-services] r5759 - in trunk/perfsonar-install-dvd: centos-5.5/desktop centos-5.5/server debian-5.0/desktop debian-5.0/server, svn-noreply, 10/01/2010
Archive powered by MHonArc 2.6.16.