Index: installers/debian/dotlrn/README.tsearch =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/README.tsearch,v diff -u -r1.2 -r1.3 --- installers/debian/dotlrn/README.tsearch 26 Jun 2008 11:22:08 -0000 1.2 +++ installers/debian/dotlrn/README.tsearch 23 Sep 2008 15:34:31 -0000 1.3 @@ -1,6 +1,8 @@ Install Full Text Search using Tsearch2 --------------------------------------- +Warning: tsearch has changed on postgresql 8.3, it may not work as expected. + 1) Install postgresql-contrib package on postgresql server. # apt-get install postgresql-contrib Index: installers/debian/dotlrn/config =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/config,v diff -u -r1.3 -r1.4 --- installers/debian/dotlrn/config 18 Sep 2008 18:29:35 -0000 1.3 +++ installers/debian/dotlrn/config 23 Sep 2008 15:34:31 -0000 1.4 @@ -6,6 +6,14 @@ db_version 2.0 db_capb backup +# Reset passwords if reconfigure +if [ "$1" = "reconfigure" ] ; then + db_reset dotlrn/dba_password + db_reset dotlrn/dba_confirm + db_reset dotlrn/dbu_password + db_reset dotlrn/dbu_confirm +fi + STATE=1 while [ "$STATE" != 0 -a "$STATE" != 13 ] do @@ -35,7 +43,7 @@ fi ;; - 3) + 3) db_input critical dotlrn/dba_password || true if db_go; then db_get dotlrn/dba_password || true @@ -45,13 +53,13 @@ fi ;; - 4) + 4) db_input critical dotlrn/dba_confirm || true if db_go; then db_get dotlrn/dba_confirm || true CONFIRM="$RET" db_get dotlrn/dba_password || true - if [ "$RET" != "$CONFIRM" ]; then + if [ A"$RET" != A"$CONFIRM" ]; then STATE=5 else STATE=6 @@ -74,13 +82,12 @@ if [ ! -z "$RET" ]; then STATE=7 fi - pg_user="$RET" else STATE=2 fi ;; - 7) + 7) db_input critical dotlrn/dbu_password || true if db_go; then db_get dotlrn/dbu_password || true @@ -90,24 +97,24 @@ fi ;; - 8) + 8) db_input critical dotlrn/dbu_confirm || true if db_go; then db_get dotlrn/dbu_confirm || true CONFIRM="$RET" db_get dotlrn/dbu_password || true - if [ "$RET" != "$CONFIRM" ]; then + if [ A"$RET" != A"$CONFIRM" ]; then STATE=9 else - # Check if host is localhost, user is not www-data and password is not null, + # Check if host is localhost and password is not null, # to change the postgresql access permissions properly. - if { [ "$pg_host" = "localhost" ] && [ "$pg_user" != "www-data" ]; } then - STATE=10 - if [ "A$RET" != "A" ]; then + if [ "$pg_host" = "localhost" ]; then + if [ A"$RET" != "A" ]; then pg_pass_blank="false" else pg_pass_blank="true" - fi + fi + STATE=10 else STATE=11 fi Index: installers/debian/dotlrn/control =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/control,v diff -u -r1.10 -r1.11 --- installers/debian/dotlrn/control 18 Sep 2008 18:29:35 -0000 1.10 +++ installers/debian/dotlrn/control 23 Sep 2008 15:34:31 -0000 1.11 @@ -9,7 +9,7 @@ Package: dotlrn Architecture: all Depends: ${misc:Depends}, aolserver4, aolserver4-nscache, aolserver4-nspostgres, aolserver4-nssha1, postgresql-client, adduser, tclthread (>= 1:2.6.5-3), tcllib, tcl8.4, wwwconfig-common, debconf, xotcl, aolserver4-xotcl, imagemagick, zip, unzip, tdom (>= 0.8.3~20080525) -Recommends: postgresql, daemontools, daemontools-run +Suggests: postgresql, daemontools, daemontools-run Description: E-learning and digital communities software based on OpenACS dotLRN is a complete open source LMS with a sophisticated portal system that integrates tools for course and content administration and Index: installers/debian/dotlrn/postinst =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/postinst,v diff -u -r1.8 -r1.9 --- installers/debian/dotlrn/postinst 18 Sep 2008 18:29:35 -0000 1.8 +++ installers/debian/dotlrn/postinst 23 Sep 2008 15:34:31 -0000 1.9 @@ -39,7 +39,7 @@ db_get dotlrn/dbu_password dbu_password="$RET" - + db_get dotlrn/pg_grant_access if [ ! -z "$RET" ]; then grant_access="$RET" @@ -133,8 +133,8 @@ fi # Delete all lines between ## dotLRN ... ## and ########### from previous configurations. # Insert connection line after the first local connection line (the postgres user connection line). - sed -i "/^## dotLRN package debconf changes (DO NOT EDIT BYHAND) ##/,/^#########################################################/d;1,/^local/{ - /^local/a ## dotLRN package debconf changes (DO NOT EDIT BYHAND) ##\nlocal dotlrn $dbu_name $pg_conn_method\n######################################################### + sed -i "/^## dotLRN package debconf changes (DO NOT EDIT BYHAND) ##/,/^##########################################################/d;1,/^local/{ + /^local/a ## dotLRN package debconf changes (DO NOT EDIT BYHAND) ##\nlocal dotlrn $dbu_name $pg_conn_method\n########################################################## } " $pg_hba_file # 4-Reload postgresql conf