Index: installers/debian/dotlrn/patches/config.dpatch
===================================================================
RCS file: /usr/local/cvsroot/installers/debian/dotlrn/patches/config.dpatch,v
diff -u -r1.5 -r1.6
--- installers/debian/dotlrn/patches/config.dpatch	3 Apr 2008 11:15:15 -0000	1.5
+++ installers/debian/dotlrn/patches/config.dpatch	6 Aug 2008 06:08:54 -0000	1.6
@@ -1,79 +1,58 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## config.dpatch by  <root@localhost>
+## config.dpatch by  <geox@localhost>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adaptation of config.tcl and daemontools/run to debian install. 
+## DP: Adaptation of config.tcl and daemontools/run to debian install.
 
 @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-26 14:33:23.000000000 +0100
-+++ dotlrn-2.3.1/etc/config.tcl	2008-03-27 13:25:56.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
- 
- # Note: If port is privileged (usually < 1024), OpenACS must be
+diff -urNad dotlrn-2.4.0~/etc/config.tcl dotlrn-2.4.0/etc/config.tcl
+--- dotlrn-2.4.0~/etc/config.tcl	2008-02-01 04:24:30.000000000 +0100
++++ dotlrn-2.4.0/etc/config.tcl	2008-08-04 11:32:24.000000000 +0200
+@@ -24,10 +24,11 @@
  # started by root, and, in AOLserver 4, the run script have a 
  # '-b address' flag which matches the address according to settings (above)
  
 -set server                    "service0" 
 -set servername                "New OpenACS Installation - Development"
--
--set serverroot                "/var/lib/aolserver/${server}"
--
-+set server                    	"dotlrn" 
-+set servername                	"dotLRN"
-+set serverroot                	"/usr/share/dotlrn"
-+set pidfile         		/var/run/aolserver4/${server}.pid
++set server                    "dotlrn" 
++set servername                "dotLRN"
+ 
+-set serverroot                "/var/www/${server}"
++set serverroot                "/usr/share/${server}"
++set pidfile                    /var/run/aolserver4/${server}.pid
+ 
  #---------------------------------------------------------------------
  # which database do you want? postgres or oracle
- set database              postgres 
-@@ -39,17 +38,18 @@
- if { $database == "oracle" } {
+@@ -38,9 +39,8 @@
+ if { $database eq "oracle" } {
      set db_password           "mysitepassword"
  } else {
 -    set db_host               localhost
 -    set db_port               ""
 -    set db_user               $server
-+
-+## Beginning of the conf changed by debconf ##
-+##############################################
-+
++## Debconf changes (DO NOT EDIT BYHAND) ##
++## End Debconf Changes ###################
  }
  
  #---------------------------------------------------------------------
- # if debug is false, all debugging will be turned off
- set debug false
- 
--set homedir                   /usr/local/aolserver
--set bindir                    [file dirname [ns_info nsd]] 
-+set homedir                   /usr/lib/aolserver4
-+set bindir                    /usr/lib/aolserver4/bin 
- 
- 
- set max_file_upload_mb        20
-@@ -86,7 +86,7 @@
+@@ -85,6 +85,7 @@
      ns_param   maxbackup          5
      ns_param   debug              $debug
  #    ns_param   mailhost           localhost 
--
-+    ns_param   pidfile		  ${pidfile}
++    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 @@
+@@ -100,7 +101,7 @@
  ns_section ns/threads 
      ns_param   mutexmeter         true      ;# measure lock contention 
      # The per-thread stack size must be a multiple of 8k for AOLServer to run under MacOS X
--    ns_param   stacksize          [expr 128 * 8192]
-+    ns_param   stacksize          [expr 512 * 8192]
+-    ns_param   stacksize          [expr {128 * 8192}]
++    ns_param   stacksize          [expr {512 * 8192}]
  
  # 
  # MIME types. 
-@@ -660,12 +660,10 @@
+@@ -659,9 +660,7 @@
      }
  
      # nsthread library which should become standard in 5.3
@@ -82,22 +61,24 @@
 -    }
 +    ns_param libthread  [lindex [glob /usr/lib/tcltk/thread*/libthread*-aolserver[info sharedlibextension]] 0]
  
- ns_log notice "nsd.tcl: using threadsafe tcl: [info exists tcl_platform(threaded)]"
+     if {[ns_info version] >= 4.5} {
+         ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
+@@ -671,4 +670,4 @@
  ns_log notice "nsd.tcl: finished reading config file."
  if {[ns_info version] >= 4.5} {
      ns_limits set default -maxupload [ns_config ns/server/${server}/module/nssock maxinput]
 -}
 \ 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-26 14:33:23.000000000 +0100
-+++ dotlrn-2.3.1/etc/daemontools/run	2008-03-27 13:20:29.000000000 +0100
+diff -urNad dotlrn-2.4.0~/etc/daemontools/run dotlrn-2.4.0/etc/daemontools/run
+--- dotlrn-2.4.0~/etc/daemontools/run	2008-01-14 10:35:56.000000000 +0100
++++ dotlrn-2.4.0/etc/daemontools/run	2008-08-04 11:32:52.000000000 +0200
 @@ -9,7 +9,7 @@
  # see http://openacs.org/forums/message-view?message_id=176100
  sleep 4
  
--exec /usr/local/aolserver/bin/nsd-postgres -it /var/lib/aolserver/service0/etc/config.tcl -u service0 -g web
-+exec /usr/lib/aolserver4/bin/nsd -it /etc/dotlrn/config.tcl -u www-data -g www-data
+-exec /usr/lib/aolserver4/bin/nsd -it /var/www/service0/etc/config.tcl -u service0 -g web
++exec /usr/lib/aolserver4/bin/nsd -it /etc/dotlrn/config.tcl -u www-data -g www-data 
  
  # For AOLserver 4 using privileged ports (usually < 1024), add the flag
  # -b youraddress:yourport to the nsd command