Index: debian_installer/README
===================================================================
diff -u -rc6125f5a33bc2a5e33e5686596d8863c2e2bf926 -r54142f2998932ba25d1c3e9ad1c14b09b218c5ed
--- debian_installer/README	(.../README)	(revision c6125f5a33bc2a5e33e5686596d8863c2e2bf926)
+++ debian_installer/README	(.../README)	(revision 54142f2998932ba25d1c3e9ad1c14b09b218c5ed)
@@ -48,7 +48,7 @@
 8.	cp -pr /path/to/jboss-4.0.2/server/default/deploy/lams.ear/ .
 9.	cp -pr /path/to/lams_build/conf/unix/jboss/ .
 10. mysqldump lams > lams.sql -u root -p
-11.	copy index.html and lams2.cnf from this cvs project into the current directory
+11.	copy index.jsp and lams2.cnf from this cvs project into the current directory
 12.	dh_make --createorig
 13.	rm -rf debian
 14.	copy the debian folder from this cvs project into the current directory
Index: debian_installer/lams2/debian/config
===================================================================
diff -u -re76fd205caafcee0c7521337f99071b574a1bfe3 -r54142f2998932ba25d1c3e9ad1c14b09b218c5ed
--- debian_installer/lams2/debian/config	(.../config)	(revision e76fd205caafcee0c7521337f99071b574a1bfe3)
+++ debian_installer/lams2/debian/config	(.../config)	(revision 54142f2998932ba25d1c3e9ad1c14b09b218c5ed)
@@ -2,25 +2,33 @@
 
 . /usr/share/debconf/confmodule
 
+# check if sysadmin pass has been answered, i.e. if we are updating existing install
+db_get lams2/sysadmin_pass || true
+sysadmin_pass="$RET"
+
 db_input critical lams2/db_root_pass || true
 #db_input critical lams2/db_name || true
 #db_input critical lams2/db_user || true
 #db_input critical lams2/db_pass || true
-db_beginblock
 db_input critical lams2/server_host || true
 db_input critical lams2/server_port || true
-db_endblock
 db_input critical lams2/sysadmin_user || true
+db_input critical lams2/sysadmin_pass || true
 
-db_go
+# don't ask this q if updating (for updating from rc1 when this q was added)
+if [ "x$sysadmin_pass" = "x" ] ; then
+    db_input critical lams2/sysadmin_pass_confirm || true
+else
+    db_set lams2/sysadmin_pass_confirm $sysadmin_pass || true
+fi
 
-db_input critical lams2/sysadmin_pass || true
-db_input critical lams2/sysadmin_pass_confirm || true
 db_go
+
 db_get lams2/sysadmin_pass || true
 sysadmin_pass="$RET"
 db_get lams2/sysadmin_pass_confirm || true
 sysadmin_pass_confirm="$RET"
+
 while [ "$sysadmin_pass" != "$sysadmin_pass_confirm" ]; do
     db_input critical lams2/sysadmin_pass_again || true
     db_input critical lams2/sysadmin_pass_confirm || true
Index: debian_installer/lams2/debian/lams2.install
===================================================================
diff -u -re76fd205caafcee0c7521337f99071b574a1bfe3 -r54142f2998932ba25d1c3e9ad1c14b09b218c5ed
--- debian_installer/lams2/debian/lams2.install	(.../lams2.install)	(revision e76fd205caafcee0c7521337f99071b574a1bfe3)
+++ debian_installer/lams2/debian/lams2.install	(.../lams2.install)	(revision 54142f2998932ba25d1c3e9ad1c14b09b218c5ed)
@@ -12,6 +12,6 @@
 lams.ear/lams-valve.jar	/usr/share/jboss-4.0.2/server/default/lib/
 lams.sql	/usr/share/lams2/
 lams2.cnf	/etc/mysql/conf.d/
-index.html	/usr/share/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/
+index.jsp	/usr/share/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/
 2.1rc1to2.1.sql	/usr/share/lams2/
 lams_tool_task	/usr/share/lams2/
Index: debian_installer/lams2/debian/postinst
===================================================================
diff -u -re76fd205caafcee0c7521337f99071b574a1bfe3 -r54142f2998932ba25d1c3e9ad1c14b09b218c5ed
--- debian_installer/lams2/debian/postinst	(.../postinst)	(revision e76fd205caafcee0c7521337f99071b574a1bfe3)
+++ debian_installer/lams2/debian/postinst	(.../postinst)	(revision 54142f2998932ba25d1c3e9ad1c14b09b218c5ed)
@@ -76,7 +76,7 @@
 
                 # Add Tasklist tool, new in 2.1
                 cd /usr/share/lams2/lams_tool_task/
-                sed -i -e "s/\(<dbDriverUrl>\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2/" deploy.xml
+                sed -i -e "s/\(<dbDriverUrl>\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
                 sed -i -e "s/\(<dbUsername>\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
                 sed -i -e "s/\(<dbPassword>\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
                 ./deploy.sh > /dev/null || true
@@ -177,9 +177,11 @@
                     mv lams-www.war /var/lib/lams/
                 fi
                 # If lams-www.war already exists, copy to /var and remove it before linking it
-                if [ -d /usr/share/jboss-4.0.2/server/default/deploy/lams.ear/lams-www.war ] ; then
-                    cp -pr lams-www.war /var/lib/lams/
-                    rm -rf lams-www.war
+                if [ ! -L /usr/share/jboss-4.0.2/server/default/deploy/lams.ear/lams-www.war ] ; then
+                    if [ -d /usr/share/jboss-4.0.2/server/default/deploy/lams.ear/lams-www.war ] ; then
+                        cp -pr lams-www.war /var/lib/lams/
+                        rm -rf lams-www.war
+                    fi
                 fi
                 ln -s /var/lib/lams/lams-www.war 2>/dev/null || true
 
@@ -215,15 +217,36 @@
             resources_forum_id=`mysql $db_name -e'select learning_library_id from lams_learning_library where title="Resources and Forum"' \
                 -u root | tail -1`
         fi
+
         cd /usr/share/jboss-4.0.2/server/default/deploy/lams.ear/lams-dictionary.jar/org/lamsfoundation/lams/library/
-        mv forumscribe llid$forum_scribe_id;
-        mv chatscribe llid$chat_scribe_id;
-        mv resourcesforum llid$resources_forum_id;
+        set +e  # don't want to fail if grep finds nothing 
+        for dir in `ls` 
+        do
+            grep resources_and_forum $dir/ApplicationResources.properties > /dev/null 2>&1
+            if [ $? = 0 ] ; then
+                if [ $dir != "llid$resources_forum_id" ]; then mv $dir llid$resources_forum_id; fi
+                continue
+            fi
+            grep chatscribe $dir/ApplicationResources.properties > /dev/null 2>&1
+            if [ $? = 0 ] ; then
+                if [ $dir != "llid$chat_scribe_id" ]; then mv $dir llid$chat_scribe_id; fi
+                continue
+            fi
+            grep forumscribe $dir/ApplicationResources.properties > /dev/null 2>&1
+            if [ $? = 0 ] ; then
+                if [ $dir != "llid$forum_scribe_id" ]; then mv $dir llid$forum_scribe_id; fi
+                continue
+            fi
+        done
+        set -e
 
         # Remove temp files
         rm -f /usr/share/lams2/2.1rc1to2.1.sql
         rm -f /usr/share/lams2/lams.sql
         rm -rf /usr/share/lams2/lams_tool_task_list
+
+        # Delete default ROOT.war/index.html (replaced with redirecting index.jsp)
+        rm -f /usr/share/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/index.html
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
Index: debian_installer/lams2/debian/templates
===================================================================
diff -u -re76fd205caafcee0c7521337f99071b574a1bfe3 -r54142f2998932ba25d1c3e9ad1c14b09b218c5ed
--- debian_installer/lams2/debian/templates	(.../templates)	(revision e76fd205caafcee0c7521337f99071b574a1bfe3)
+++ debian_installer/lams2/debian/templates	(.../templates)	(revision 54142f2998932ba25d1c3e9ad1c14b09b218c5ed)
@@ -44,18 +44,15 @@
 
 Template: lams2/sysadmin_pass
 Type: password
-Default: sysadmin
 Description: Enter the password for your admin user:
- The password for your admin user.  Must not be blank.
+ The password for your admin user.
 
 Template: lams2/sysadmin_pass_confirm
 Type: password
-Default: sysadmin
 Description: Confirm the password for your admin user:
- The password for your admin user.  Must not be blank.
+ The password for your admin user.
 
 Template: lams2/sysadmin_pass_again
 Type: password
-Default: sysadmin
 Description: Re-enter the password for your admin user:
  The passwords don't match.
Fisheye: Tag 54142f2998932ba25d1c3e9ad1c14b09b218c5ed refers to a dead (removed) revision in file `debian_installer/lams2/index.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: debian_installer/lams2/index.jsp
===================================================================
diff -u
--- debian_installer/lams2/index.jsp	(revision 0)
+++ debian_installer/lams2/index.jsp	(revision 54142f2998932ba25d1c3e9ad1c14b09b218c5ed)
@@ -0,0 +1 @@
+<% response.sendRedirect("/lams"); %>