perfsonar development work

Author: psnc.lopatowski
Date: 2011-03-15 15:32:28 +0000 (Tue, 15 Mar 2011)
New Revision: 5811

Added:
   trunk/perfsonar-install-dvd/debian-5.0/desktop/setgeantbackground
   trunk/perfsonar-install-dvd/debian-5.0/java6-install.sh
   trunk/perfsonar-install-dvd/debian-5.0/mysql-install.sh
   trunk/perfsonar-install-dvd/debian-5.0/tomcat-install.sh
Modified:
   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/postinstall0
   trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1
Log:


Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun     
2011-03-06 21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselautorun     
2011-03-15 15:32:28 UTC (rev 5811)
@@ -3,3 +3,5 @@
 # Iceweasel autorun script to be launched after user login
 
 iceweasel /home/psuser/perf.html &
+
+

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig      
2011-03-06 21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/iceweaselconfig      
2011-03-15 15:32:28 UTC (rev 5811)
@@ -38,10 +38,6 @@
    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 2011-03-06 
21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2011-03-15 
15:32:28 UTC (rev 5811)
@@ -2,12 +2,7 @@
 
 clear
 sleep 1
-dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 DVD for 
Debian 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
 
-apt-get -y install sun-java6-jre
-echo
-
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
        --msgbox "\n       This will install the perfSONAR MDM 3.3" 7 60
 
@@ -62,23 +57,35 @@
 echo
 fi
 
+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"
+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 Iceweasel browser <<<"
 /root/perfSONAR/scripts/desktop/iceweaselconfig $select
 echo
-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 ">>> Configuring GN3 background <<<"
+cp /root/perfSONAR/scripts/desktop/setgeantbackground 
/etc/X11/Xsession.d/99setgeantbackground
+chmod 777 /etc/X11/Xsession.d/99setgeantbackground
 echo
-echo ">>> Changing Tomcat security to NO <<<"
-sed -e 's/#TOMCAT5_SECURITY=yes/TOMCAT5_SECURITY=no/' /etc/default/tomcat5.5 
> /root/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
-fi
 
 if [[ $select == *1* ]]; then
        exec 1>&6 6>&-
@@ -162,8 +169,6 @@
 
        apt-get -y install perfsonar-oppd-mp-bwctl
        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 2011-03-06 
21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall1 2011-03-15 
15:32:28 UTC (rev 5811)
@@ -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 Debian 5" \
        --msgbox "$OPTIONS" 8 60
@@ -99,13 +93,6 @@
 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."
 echo

Added: trunk/perfsonar-install-dvd/debian-5.0/desktop/setgeantbackground
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/setgeantbackground         
                  (rev 0)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/setgeantbackground   
2011-03-15 15:32:28 UTC (rev 5811)
@@ -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 
/root/perfSONAR/debs/GEANT3-logo.gif
+gconftool-2 --type string --set /desktop/gnome/background/picture_options 
centered
+
+
+

Added: trunk/perfsonar-install-dvd/debian-5.0/java6-install.sh
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/java6-install.sh                   
          (rev 0)
+++ trunk/perfsonar-install-dvd/debian-5.0/java6-install.sh     2011-03-15 
15:32:28 UTC (rev 5811)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+LOGFILE=/root/perfSONAR.log
+
+echo ">>> Installing Sun Java6 <<<"
+echo
+
+exec 1>&6 6>&-
+
+dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 DVD for 
Debian 5" \
+       --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-jre
+echo
+
+exec 6>&1
+exec >> $LOGFILE 2>&1
+
+echo ">>> Setting JAVA_HOME variable <<<"
+echo 'JAVA_HOME="/usr/lib/jvm/java-6-sun"' | tee -a /etc/environment
+echo
+


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

Added: trunk/perfsonar-install-dvd/debian-5.0/mysql-install.sh
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/mysql-install.sh                   
          (rev 0)
+++ trunk/perfsonar-install-dvd/debian-5.0/mysql-install.sh     2011-03-15 
15:32:28 UTC (rev 5811)
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+LOGFILE=/root/perfSONAR.log
+
+exec 6>&1
+exec >> $LOGFILE 2>&1
+
+echo ">>> Installing MySql <<<"
+echo
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get -y install mysql-server
+
+unset DEBIAN_FRONTEND
+


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

Modified: trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg  2011-03-06 
21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/preseed-desktop.cfg  2011-03-15 
15:32:28 UTC (rev 5811)
@@ -46,18 +46,13 @@
 d-i apt-setup/local0/source boolean true
 d-i apt-setup/use_mirror boolean false
 
-### MySQL 5.0
-mysql-server-5.0 mysql-server/root_password string
-mysql-server-5.0 mysql-server/root_password seen true
-mysql-server-5.0 mysql-server/root_password_again string
-mysql-server-5.0 mysql-server/root_password_again seen true
-
 ### Package selection
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include string build-essential sudo ssh expect dialog lynx \
-                          mysql-server ntp apache2 \
-                          xorg gnome-core gdm iceweasel
 
+d-i pkgsel/include string build-essential mc sudo ssh expect dialog \
+                          ntp apache2 iceweasel \
+                         xorg gnome-core gdm
+
 popularity-contest popularity-contest/participate boolean false
 d-i grub-installer/only_debian boolean true
 d-i finish-install/reboot_in_progress note
@@ -76,5 +71,6 @@
                                 in-target chmod +x 
/root/perfSONAR/scripts/desktop/chbwctlpass; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/desktop/chmysqlpass; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/desktop/iceweaselconfig; \
-                                in-target chmod +x 
/root/perfSONAR/scripts/desktop/iceweaselautorun;
+                                in-target chmod +x 
/root/perfSONAR/scripts/desktop/iceweaselautorun; \
+                                in-target chmod +x 
/root/perfSONAR/scripts/desktop/setgeantbackground;
 

Modified: trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg  2011-03-06 21:19:44 
UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg  2011-03-15 15:32:28 
UTC (rev 5811)
@@ -43,17 +43,12 @@
 d-i apt-setup/local0/source boolean true
 d-i apt-setup/use_mirror boolean false
 
-### MySQL 5.0
-mysql-server-5.0 mysql-server/root_password string
-mysql-server-5.0 mysql-server/root_password seen true
-mysql-server-5.0 mysql-server/root_password_again string
-mysql-server-5.0 mysql-server/root_password_again seen true
-
 ### Package selection
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include string build-essential sudo ssh expect dialog lynx \
-                          mysql-server ntp apache2
 
+d-i pkgsel/include string build-essential mc sudo ssh expect dialog lynx \
+                          ntp apache2
+
 popularity-contest popularity-contest/participate boolean false
 d-i grub-installer/only_debian boolean true
 d-i finish-install/reboot_in_progress note
@@ -71,6 +66,9 @@
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/chrootpass; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/chbwctlpass; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/chmysqlpass; \
+                                in-target chmod +x 
/root/perfSONAR/scripts/server/lynxautorun; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/lynxconfig; \
-                                in-target chmod +x 
/root/perfSONAR/scripts/server/lynxautorun;
+                                in-target chmod +x 
/root/perfSONAR/scripts/java6-install.sh; \
+                                in-target chmod +x 
/root/perfSONAR/scripts/mysql-install.sh; \
+                                in-target chmod +x 
/root/perfSONAR/scripts/tomcat-install.sh;
 

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2011-03-06 
21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2011-03-15 
15:32:28 UTC (rev 5811)
@@ -2,12 +2,7 @@
 
 clear
 sleep 1
-dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 DVD for 
Debian 5" \
-       --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-jre
-echo
-
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
        --msgbox "\n       This will install the perfSONAR MDM 3.3" 7 60
 
@@ -62,24 +57,31 @@
 echo
 fi
 
+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"
+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
-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
-echo ">>> Changing Tomcat security to NO <<<"
-sed -e 's/#TOMCAT5_SECURITY=yes/TOMCAT5_SECURITY=no/' /etc/default/tomcat5.5 
> /root/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
-fi
-
 if [[ $select == *1* ]]; then
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 DVD for Debian 5" \
@@ -162,8 +164,6 @@
 
        apt-get -y install perfsonar-oppd-mp-bwctl
        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  2011-03-06 
21:19:44 UTC (rev 5810)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall1  2011-03-15 
15:32:28 UTC (rev 5811)
@@ -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 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,13 +60,6 @@
 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."
 echo

Added: trunk/perfsonar-install-dvd/debian-5.0/tomcat-install.sh
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/tomcat-install.sh                  
          (rev 0)
+++ trunk/perfsonar-install-dvd/debian-5.0/tomcat-install.sh    2011-03-15 
15:32:28 UTC (rev 5811)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+LOGFILE=/root/perfSONAR.log
+
+exec 6>&1
+exec >> $LOGFILE 2>&1
+
+echo ">>> Installing tomcat5.5 <<<"
+echo
+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
+
+echo ">>> Setting JAVA_HOME variable in Tomcat configuration file <<<"
+sed -e 
's/#JAVA_HOME=\/usr\/lib\/jvm\/java-6-sun/JAVA_HOME=\/usr\/lib\/jvm\/java-6-sun/'
 /root/tomcat5.5 > /etc/default/tomcat5.5
+rm /root/tomcat5.5
+


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