Index: installers/debian/openacs/config =================================================================== RCS file: /usr/local/cvsroot/installers/debian/openacs/config,v diff -u -N -r1.2 -r1.3 --- installers/debian/openacs/config 18 Sep 2008 17:42:25 -0000 1.2 +++ installers/debian/openacs/config 23 Sep 2008 14:11:24 -0000 1.3 @@ -6,6 +6,14 @@ db_version 2.0 db_capb backup +# Reset passwords if reconfigure +if [ "$1" = "reconfigure" ] ; then + db_reset openacs/dba_password + db_reset openacs/dba_confirm + db_reset openacs/dbu_password + db_reset openacs/dbu_confirm +fi + STATE=1 while [ "$STATE" != 0 -a "$STATE" != 13 ] do @@ -35,7 +43,7 @@ fi ;; - 3) + 3) db_input critical openacs/dba_password || true if db_go; then db_get openacs/dba_password || true @@ -45,13 +53,13 @@ fi ;; - 4) + 4) db_input critical openacs/dba_confirm || true if db_go; then db_get openacs/dba_confirm || true CONFIRM="$RET" db_get openacs/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 openacs/dbu_password || true if db_go; then db_get openacs/dbu_password || true @@ -90,24 +97,24 @@ fi ;; - 8) + 8) db_input critical openacs/dbu_confirm || true if db_go; then db_get openacs/dbu_confirm || true CONFIRM="$RET" db_get openacs/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