Index: installers/debian/dotlrn/TODO =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/Attic/TODO,v diff -u -r1.5 -r1.6 --- installers/debian/dotlrn/TODO 26 Mar 2008 12:37:03 -0000 1.5 +++ installers/debian/dotlrn/TODO 26 Mar 2008 13:42:16 -0000 1.6 @@ -2,11 +2,12 @@ [X] Modification of the config.tcl using the FHS routes. [X] Set permissions for user www-data. [ ] Load tsearch sql. -[\] Enable compatibility postgresql options (Added a warning on debconf). +[\] Enable compatibility postgresql options. (Added a warning on debconf). [X] Remove and purge logic (postrm). [ ] Lintian errors and warnings. [ ] Fix control file adding tdom (when there is a tdom debian package) [ ] Fix control file adding postgresql-contrib as a dependance (for tsearch), and setting all the package in contrib. -[ ] Add some docs. +[ ] Debian libthread not loading properly +[ ] Add some docs -- Héctor Romojaro Index: installers/debian/dotlrn/dotlrn.init =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/dotlrn.init,v diff -u -r1.2 -r1.3 --- installers/debian/dotlrn/dotlrn.init 26 Mar 2008 12:37:03 -0000 1.2 +++ installers/debian/dotlrn/dotlrn.init 26 Mar 2008 13:42:16 -0000 1.3 @@ -9,7 +9,7 @@ CONF=/etc/dotlrn/config.tcl ADDRESS=$(grep "^set address" $CONF | sed 's/set//;s/address//;s/^[ \t]*//') PORT=$(grep "^set httpport" $CONF | sed 's/set//;s/httpport//;s/^[ \t]*//') -PIDFILE=$(grep "^set pidfile" $CONF | sed 's/pidfile//;s/pidfile//;s/^[ \t]*//') +PIDFILE=/var/run/aolserver4/$NAME.pid PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/aolserver4-nsd Index: installers/debian/dotlrn/postinst =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/postinst,v diff -u -r1.3 -r1.4 --- installers/debian/dotlrn/postinst 14 Mar 2008 13:06:37 -0000 1.3 +++ installers/debian/dotlrn/postinst 26 Mar 2008 13:42:16 -0000 1.4 @@ -104,7 +104,8 @@ fi # Modify config.tcl with debconf values - sed -i "s/## Beginning of the conf changed by debconf ##/&\n set db_host $dbserver\n set db_password \"$dbpass\"\n set db_port \"5432\"\n set db_user $dbuser/" /etc/dotlrn/config.tcl + + sed -i "/^ set db_host/,/^ set db_user/d;s/## Beginning of the conf changed by debconf ##/&\n set db_host $dbserver\n set db_password \"$dbpass\"\n set db_port \"5432\"\n set db_user $dbuser/" /etc/dotlrn/config.tcl # Install tsearch2 #. /usr/share/wwwconfig-common/pgsql-exec.sh Index: installers/debian/dotlrn/patches/config.dpatch =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/patches/config.dpatch,v diff -u -r1.2 -r1.3 --- installers/debian/dotlrn/patches/config.dpatch 14 Mar 2008 13:06:37 -0000 1.2 +++ installers/debian/dotlrn/patches/config.dpatch 26 Mar 2008 13:42:17 -0000 1.3 @@ -6,14 +6,14 @@ @DPATCH@ diff -urNad dotlrn-2.3.1~/etc/config.tcl dotlrn-2.3.1/etc/config.tcl ---- dotlrn-2.3.1~/etc/config.tcl 2008-03-14 12:15:20.000000000 +0100 -+++ dotlrn-2.3.1/etc/config.tcl 2008-03-14 12:27:20.000000000 +0100 +--- dotlrn-2.3.1~/etc/config.tcl 2008-03-26 14:22:24.000000000 +0100 ++++ dotlrn-2.3.1/etc/config.tcl 2008-03-26 14:29:50.000000000 +0100 @@ -19,17 +19,16 @@ # setting the address to 0.0.0.0 means aolserver listens on all interfaces set hostname [ns_info hostname] #set address [ns_info address] -set address 0.0.0.0 -+set address 127.0.0.1 ++set address 127.0.0.1 # Note: If port is privileged (usually < 1024), OpenACS must be # started by root, and, in AOLserver 4, the run script have a @@ -55,6 +55,15 @@ set max_file_upload_mb 20 +@@ -86,7 +86,7 @@ + ns_param maxbackup 5 + ns_param debug $debug + # ns_param mailhost localhost +- ++ ns_param pidfile ${pidfile} + # setting to Unicode by default + # see http://dqd.com/~mayoff/encoding-doc.html + ns_param HackContentType 1 @@ -101,7 +101,7 @@ ns_section ns/threads ns_param mutexmeter true ;# measure lock contention @@ -82,8 +91,8 @@ \ No newline at end of file +} diff -urNad dotlrn-2.3.1~/etc/daemontools/run dotlrn-2.3.1/etc/daemontools/run ---- dotlrn-2.3.1~/etc/daemontools/run 2008-03-14 12:15:20.000000000 +0100 -+++ dotlrn-2.3.1/etc/daemontools/run 2008-03-14 12:23:00.000000000 +0100 +--- dotlrn-2.3.1~/etc/daemontools/run 2008-03-26 14:22:24.000000000 +0100 ++++ dotlrn-2.3.1/etc/daemontools/run 2008-03-26 14:29:25.000000000 +0100 @@ -9,7 +9,7 @@ # see http://openacs.org/forums/message-view?message_id=176100 sleep 4