[Fai-commit] r4394 - people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER

[lazyboy-guest at alioth.debian.org]

Author: lazyboy-guest
Date: 2007-07-06 00:36:06 +0000 (Fri, 06 Jul 2007)
New Revision: 4394

Modified:
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/20-install-java
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/30-install-jetspeed
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/40-install-tomcat
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/50-install-phpmyadmin
Log:
some fixes in the WEBSERVER examples

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/20-install-java
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/20-install-java	2007-07-06 00:35:12 UTC (rev 4393)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/20-install-java	2007-07-06 00:36:06 UTC (rev 4394)
@@ -1,4 +1,6 @@
 #! /bin/bash
 
+# TODO: only do this if jdk is not already installed!
+
 $ROOTCMD wget -P/tmp http://debmirror/mirrors/binary-packages/jdk-6u1-linux-i586.rpm
 $ROOTCMD rpm -i /tmp/jdk-6u1-linux-i586.rpm

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/30-install-jetspeed
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/30-install-jetspeed	2007-07-06 00:35:12 UTC (rev 4393)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/30-install-jetspeed	2007-07-06 00:36:06 UTC (rev 4394)
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-$ROOTCMD wget -P/tmp/ http://debmirror/mirrors/binary-packages/jetspeed-2.1-demo-installer.jar
+#$ROOTCMD wget -P/tmp/ http://debmirror/mirrors/binary-packages/jetspeed-2.1-demo-installer.jar
 #yes y > $ROOTCMD /usr/java/latest/bin/java -jar /tmp/jetspeed-2.1-demo-installer.jar
 
-echo "jetspeed install not ready yet"
-exit 1
+echo "TODO: jetspeed install not ready yet"
+#exit 1

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/40-install-tomcat
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/40-install-tomcat	2007-07-06 00:35:12 UTC (rev 4393)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/40-install-tomcat	2007-07-06 00:36:06 UTC (rev 4394)
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 $ROOTCMD wget -P/tmp http://debmirror/mirrors/binary-packages/apache-tomcat-6.0.13.tar.gz
-$ROOTCMD tar xvfz /tmp/apache-tomcat-6.0.13.tar.gz -C /opt/
+$ROOTCMD tar xfz /tmp/apache-tomcat-6.0.13.tar.gz -C /opt/
 
 echo "TODO: create a start script, and enable it to be run at system startup"
-exit 1
+#exit 0

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/50-install-phpmyadmin
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/50-install-phpmyadmin	2007-07-06 00:35:12 UTC (rev 4393)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/scripts/RHEL-DEMO-WEBSERVER/50-install-phpmyadmin	2007-07-06 00:36:06 UTC (rev 4394)
@@ -1,5 +1,5 @@
 #!/bin/sh
 $ROOTCMD wget -P/tmp http://debmirror/mirrors/binary-packages/phpMyAdmin-2.10.2-english.tar.bz2
-$ROOTCMD tar xvfz /tmp/phpMyAdmin-2.10.2-english.tar.bz2 -C /var/www/html/
+$ROOTCMD tar xfj /tmp/phpMyAdmin-2.10.2-english.tar.bz2 -C /var/www/html/
 $ROOTCMD ln -s /var/www/phpMyAdmin-2.10.2-english /var/www/myadmin