Index: installers/debian/dotlrn/README.daemontools =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/README.daemontools,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ installers/debian/dotlrn/README.daemontools 22 Oct 2008 12:04:22 -0000 1.1 @@ -0,0 +1,18 @@ +dotLRN and daemontools +---------------------- + +dotLRN daemon can be controlled using daemontools instead of the init.d script. To do that, follow the next steps: + +1) Change the "StartDaemon" value to "no" on /etc/default/dotlrn to disable the dotlrn init.d script. + +2) Stop the daemon (/etc/init.d/dotlrn stop) + +3) Link daemontools dotlrn script ( ln -s /usr/share/dotlrn/etc/daemontools /etc/service/dotlrn ). + +Now you can control the dotlrn service using the svc command: + +* To start the service: svc -u /etc/service/dotlrn. +* To stop the service: svc -d /etc/service/dotlrn. +* To restart the service: svc -t /etc/service/dotlrn. + +For more info, please check the svc command man page. Index: installers/debian/dotlrn/docs =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/docs,v diff -u -N -r1.1 -r1.2 --- installers/debian/dotlrn/docs 1 Apr 2008 10:35:41 -0000 1.1 +++ installers/debian/dotlrn/docs 22 Oct 2008 12:04:22 -0000 1.2 @@ -1 +1,2 @@ debian/README.tsearch +debian/README.daemontools Index: installers/debian/dotlrn/dotlrn.default =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/dotlrn.default,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ installers/debian/dotlrn/dotlrn.default 22 Oct 2008 12:04:22 -0000 1.1 @@ -0,0 +1,4 @@ +### dotLRN default file + +## Set this to "no" to disable the /etc/init.d/dotlrn script. +# StartDaemon="no" Index: installers/debian/dotlrn/dotlrn.init =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/dotlrn.init,v diff -u -N -r1.4 -r1.5 --- installers/debian/dotlrn/dotlrn.init 3 Apr 2008 12:12:17 -0000 1.4 +++ installers/debian/dotlrn/dotlrn.init 22 Oct 2008 12:04:22 -0000 1.5 @@ -23,6 +23,11 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/aolserver4-nsd +# Edit /etc/default/dotlrn to change this +StartDaemon="yes" + +test -f /etc/default/dotlrn && . /etc/default/dotlrn + trap "" 1 [ -f $DAEMON ] || exit 0 Index: installers/debian/dotlrn/patches/00list =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/patches/00list,v diff -u -N -r1.3 -r1.4 --- installers/debian/dotlrn/patches/00list 6 Aug 2008 06:08:54 -0000 1.3 +++ installers/debian/dotlrn/patches/00list 22 Oct 2008 12:04:22 -0000 1.4 @@ -1,2 +1,2 @@ config.dpatch -interpreters-patch.dpatch +interpreters-path.dpatch Index: installers/debian/dotlrn/patches/config.dpatch =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/patches/config.dpatch,v diff -u -N -r1.7 -r1.8 --- installers/debian/dotlrn/patches/config.dpatch 18 Sep 2008 18:29:35 -0000 1.7 +++ installers/debian/dotlrn/patches/config.dpatch 22 Oct 2008 12:04:22 -0000 1.8 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad dotlrn-2.4.0~/etc/config.tcl dotlrn-2.4.0/etc/config.tcl ---- dotlrn-2.4.0~/etc/config.tcl 2008-09-04 14:43:05.000000000 +0200 -+++ dotlrn-2.4.0/etc/config.tcl 2008-09-18 19:43:37.000000000 +0200 +--- dotlrn-2.4.0~/etc/config.tcl 2008-09-23 16:04:25.000000000 +0200 ++++ dotlrn-2.4.0/etc/config.tcl 2008-10-22 13:16:29.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) @@ -98,14 +98,21 @@ \ No newline at end of file +} diff -urNad dotlrn-2.4.0~/etc/daemontools/run dotlrn-2.4.0/etc/daemontools/run ---- dotlrn-2.4.0~/etc/daemontools/run 2008-09-04 14:43:05.000000000 +0200 -+++ dotlrn-2.4.0/etc/daemontools/run 2008-09-18 19:43:37.000000000 +0200 -@@ -9,7 +9,7 @@ +--- dotlrn-2.4.0~/etc/daemontools/run 2008-09-23 16:04:25.000000000 +0200 ++++ dotlrn-2.4.0/etc/daemontools/run 2008-10-22 13:18:55.000000000 +0200 +@@ -9,7 +9,14 @@ # see http://openacs.org/forums/message-view?message_id=176100 sleep 4 -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 ++DAEMON="/usr/lib/aolserver4/bin/nsd" ++USER="www-data" ++GROUP="www-data" ++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]*//') ++ ++exec $DAEMON -it $CONF -u $USER -g $GROUP -b $ADDRESS:$PORT # For AOLserver 4 using privileged ports (usually < 1024), add the flag # -b youraddress:yourport to the nsd command Index: installers/debian/dotlrn/patches/interpreters-path.dpatch =================================================================== RCS file: /usr/local/cvsroot/installers/debian/dotlrn/patches/interpreters-path.dpatch,v diff -u -N -r1.2 -r1.3 --- installers/debian/dotlrn/patches/interpreters-path.dpatch 3 Apr 2008 11:15:15 -0000 1.2 +++ installers/debian/dotlrn/patches/interpreters-path.dpatch 22 Oct 2008 12:04:22 -0000 1.3 @@ -2,83 +2,83 @@ ## interpreters-path.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes some routes for interpreters on scripts. +## DP: Fixes some paths for interpreters on scripts. @DPATCH@ -diff -urNad dotlrn-2.3.1~/bin/ad-context-server.pl dotlrn-2.3.1/bin/ad-context-server.pl ---- dotlrn-2.3.1~/bin/ad-context-server.pl 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/bin/ad-context-server.pl 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/bin/ad-context-server.pl dotlrn-2.4.0/bin/ad-context-server.pl +--- dotlrn-2.4.0~/bin/ad-context-server.pl 2001-03-13 23:59:26.000000000 +0100 ++++ dotlrn-2.4.0/bin/ad-context-server.pl 2008-08-04 13:07:55.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl ########################################################## # ArsDigita Context Server -diff -urNad dotlrn-2.3.1~/bin/create-sql-drop-file.pl dotlrn-2.3.1/bin/create-sql-drop-file.pl ---- dotlrn-2.3.1~/bin/create-sql-drop-file.pl 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/bin/create-sql-drop-file.pl 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/bin/create-sql-drop-file.pl dotlrn-2.4.0/bin/create-sql-drop-file.pl +--- dotlrn-2.4.0~/bin/create-sql-drop-file.pl 2001-03-13 23:59:26.000000000 +0100 ++++ dotlrn-2.4.0/bin/create-sql-drop-file.pl 2008-08-04 13:07:36.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # @author: Jim Guggemoos created it # @author: Christian Brechbuehler some maintenance -diff -urNad dotlrn-2.3.1~/bin/data-dictionary-diff.pl dotlrn-2.3.1/bin/data-dictionary-diff.pl ---- dotlrn-2.3.1~/bin/data-dictionary-diff.pl 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/bin/data-dictionary-diff.pl 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/bin/data-dictionary-diff.pl dotlrn-2.4.0/bin/data-dictionary-diff.pl +--- dotlrn-2.4.0~/bin/data-dictionary-diff.pl 2001-03-13 23:59:26.000000000 +0100 ++++ dotlrn-2.4.0/bin/data-dictionary-diff.pl 2008-08-04 13:07:09.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # by Jin Choi , 2000-03-20 -diff -urNad dotlrn-2.3.1~/bin/encode64.pl dotlrn-2.3.1/bin/encode64.pl ---- dotlrn-2.3.1~/bin/encode64.pl 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/bin/encode64.pl 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/bin/encode64.pl dotlrn-2.4.0/bin/encode64.pl +--- dotlrn-2.4.0~/bin/encode64.pl 2001-03-13 23:59:26.000000000 +0100 ++++ dotlrn-2.4.0/bin/encode64.pl 2008-08-04 13:06:53.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # Encode a file from stdin as base64 # -diff -urNad dotlrn-2.3.1~/bin/plsql-diff.pl dotlrn-2.3.1/bin/plsql-diff.pl ---- dotlrn-2.3.1~/bin/plsql-diff.pl 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/bin/plsql-diff.pl 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/bin/plsql-diff.pl dotlrn-2.4.0/bin/plsql-diff.pl +--- dotlrn-2.4.0~/bin/plsql-diff.pl 2001-03-13 23:59:26.000000000 +0100 ++++ dotlrn-2.4.0/bin/plsql-diff.pl 2008-08-04 13:06:40.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # by Jin Choi , 2000-03-21 -diff -urNad dotlrn-2.3.1~/bin/triggers-diff.pl dotlrn-2.3.1/bin/triggers-diff.pl ---- dotlrn-2.3.1~/bin/triggers-diff.pl 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/bin/triggers-diff.pl 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/bin/triggers-diff.pl dotlrn-2.4.0/bin/triggers-diff.pl +--- dotlrn-2.4.0~/bin/triggers-diff.pl 2001-03-13 23:59:26.000000000 +0100 ++++ dotlrn-2.4.0/bin/triggers-diff.pl 2008-08-04 13:06:16.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # by Jin Choi , 2000-03-26 -diff -urNad dotlrn-2.3.1~/etc/deploy.sh dotlrn-2.3.1/etc/deploy.sh ---- dotlrn-2.3.1~/etc/deploy.sh 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/etc/deploy.sh 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/etc/deploy.sh dotlrn-2.4.0/etc/deploy.sh +--- dotlrn-2.4.0~/etc/deploy.sh 2004-03-03 14:18:35.000000000 +0100 ++++ dotlrn-2.4.0/etc/deploy.sh 2008-08-04 13:08:12.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bin/tclsh +#!/usr/bin/tclsh # process command line arguments foreach arg $argv { switch -glob -- $arg { -diff -urNad dotlrn-2.3.1~/etc/install/functions.sh dotlrn-2.3.1/etc/install/functions.sh ---- dotlrn-2.3.1~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200 -+++ dotlrn-2.3.1/etc/install/functions.sh 2008-04-03 11:33:47.000000000 +0200 +diff -urNad dotlrn-2.4.0~/etc/install/functions.sh dotlrn-2.4.0/etc/install/functions.sh +--- dotlrn-2.4.0~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200 ++++ dotlrn-2.4.0/etc/install/functions.sh 2008-08-04 13:04:59.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/sh # Access config parameters in the TCL file through this function get_config_param () { -diff -urNad dotlrn-2.3.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt dotlrn-2.3.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt ---- dotlrn-2.3.1~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt 2008-04-03 11:27:23.000000000 +0200 -+++ dotlrn-2.3.1/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt 2008-04-03 11:33:25.000000000 +0200 +diff -urNad dotlrn-2.4.0~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt dotlrn-2.4.0/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt +--- dotlrn-2.4.0~/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt 2003-06-24 05:19:17.000000000 +0200 ++++ dotlrn-2.4.0/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt 2008-08-04 13:05:58.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/sh +#!/bin/sh @@ -92,25 +92,25 @@ -svc -u $1 \ No newline at end of file +svc -u $1 -diff -urNad dotlrn-2.3.1~/packages/acs-lang/bin/functions.sh dotlrn-2.3.1/packages/acs-lang/bin/functions.sh ---- dotlrn-2.3.1~/packages/acs-lang/bin/functions.sh 2003-10-31 13:58:29.000000000 +0100 -+++ dotlrn-2.3.1/packages/acs-lang/bin/functions.sh 2008-04-03 11:34:02.000000000 +0200 +diff -urNad dotlrn-2.4.0~/packages/acs-lang/bin/functions.sh dotlrn-2.4.0/packages/acs-lang/bin/functions.sh +--- dotlrn-2.4.0~/packages/acs-lang/bin/functions.sh 2003-10-31 13:58:29.000000000 +0100 ++++ dotlrn-2.4.0/packages/acs-lang/bin/functions.sh 2008-08-04 13:04:19.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/sh # Functions re-used by scripts in acs-lang/bin # # @author Peter Marklund -diff -urNad dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/images.pl dotlrn-2.3.1/packages/theme-selva/www/doc/howto/images.pl ---- dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/images.pl 2005-07-26 16:28:31.000000000 +0200 -+++ dotlrn-2.3.1/packages/theme-selva/www/doc/howto/images.pl 2008-04-03 11:34:44.000000000 +0200 +diff -urNad dotlrn-2.4.0~/packages/theme-selva/www/doc/howto/images.pl dotlrn-2.4.0/packages/theme-selva/www/doc/howto/images.pl +--- dotlrn-2.4.0~/packages/theme-selva/www/doc/howto/images.pl 2005-07-26 16:28:31.000000000 +0200 ++++ dotlrn-2.4.0/packages/theme-selva/www/doc/howto/images.pl 2008-08-04 13:03:31.000000000 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/perl # LaTeX2HTML 2002-2-1 (1.70) # Associate images original text with physical files. -diff -urNad dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/labels.pl dotlrn-2.3.1/packages/theme-selva/www/doc/howto/labels.pl ---- dotlrn-2.3.1~/packages/theme-selva/www/doc/howto/labels.pl 2005-07-26 16:28:30.000000000 +0200 -+++ dotlrn-2.3.1/packages/theme-selva/www/doc/howto/labels.pl 2008-04-03 11:35:54.000000000 +0200 +diff -urNad dotlrn-2.4.0~/packages/theme-selva/www/doc/howto/labels.pl dotlrn-2.4.0/packages/theme-selva/www/doc/howto/labels.pl +--- dotlrn-2.4.0~/packages/theme-selva/www/doc/howto/labels.pl 2005-07-26 16:28:30.000000000 +0200 ++++ dotlrn-2.4.0/packages/theme-selva/www/doc/howto/labels.pl 2008-08-04 13:05:35.000000000 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/perl # LaTeX2HTML 2002-2-1 (1.70) Index: installers/debian/openacs/README.daemontools =================================================================== RCS file: /usr/local/cvsroot/installers/debian/openacs/README.daemontools,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ installers/debian/openacs/README.daemontools 22 Oct 2008 12:04:22 -0000 1.1 @@ -0,0 +1,18 @@ +Openacs and daemontools +----------------------- + +OpenACS daemon can be controlled using daemontools instead of the init.d script. To do that, follow the next steps: + +1) Change the "StartDaemon" value to "no" on /etc/default/openacs to disable the openacs init.d script. + +2) Stop the daemon (/etc/init.d/openacs stop) + +3) Link daemontools openacs script ( ln -s /usr/share/openacs/etc/daemontools /etc/service/openacs ). + +Now you can control the openacs service using the svc command: + +* To start the service: svc -u /etc/service/openacs. +* To stop the service: svc -d /etc/service/openacs. +* To restart the service: svc -t /etc/service/openacs. + +For more info, please check the svc command man page. Index: installers/debian/openacs/docs =================================================================== RCS file: /usr/local/cvsroot/installers/debian/openacs/docs,v diff -u -N -r1.1 -r1.2 --- installers/debian/openacs/docs 4 Apr 2008 14:10:31 -0000 1.1 +++ installers/debian/openacs/docs 22 Oct 2008 12:04:22 -0000 1.2 @@ -1 +1,2 @@ debian/README.tsearch +debian/README.daemontools Index: installers/debian/openacs/openacs.default =================================================================== RCS file: /usr/local/cvsroot/installers/debian/openacs/openacs.default,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ installers/debian/openacs/openacs.default 22 Oct 2008 12:04:22 -0000 1.1 @@ -0,0 +1,4 @@ +### Openacs default file + +## Set this to "no" to disable the /etc/init.d/openacs script. +# StartDaemon="no" Index: installers/debian/openacs/openacs.init =================================================================== RCS file: /usr/local/cvsroot/installers/debian/openacs/openacs.init,v diff -u -N -r1.1 -r1.2 --- installers/debian/openacs/openacs.init 4 Apr 2008 14:10:31 -0000 1.1 +++ installers/debian/openacs/openacs.init 22 Oct 2008 12:04:22 -0000 1.2 @@ -23,6 +23,11 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/aolserver4-nsd +# Edit /etc/default/openacs to change this +StartDaemon="yes" + +test -f /etc/default/openacs && . /etc/default/openacs + trap "" 1 [ -f $DAEMON ] || exit 0 @@ -56,7 +61,11 @@ case "$1" in start) - start + if [ $StartDaemon = "yes" ]; then + start + else + echo -n "Not starting web server $NAME (see /etc/default/openacs)." + fi ;; stop) Index: installers/debian/openacs/patches/config.dpatch =================================================================== RCS file: /usr/local/cvsroot/installers/debian/openacs/patches/config.dpatch,v diff -u -N -r1.5 -r1.6 --- installers/debian/openacs/patches/config.dpatch 18 Sep 2008 17:42:25 -0000 1.5 +++ installers/debian/openacs/patches/config.dpatch 22 Oct 2008 12:04:22 -0000 1.6 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad openacs-5.4.2~/etc/config.tcl openacs-5.4.2/etc/config.tcl ---- openacs-5.4.2~/etc/config.tcl 2008-08-07 09:39:40.000000000 +0200 -+++ openacs-5.4.2/etc/config.tcl 2008-09-04 14:39:07.000000000 +0200 +--- openacs-5.4.2~/etc/config.tcl 2008-09-23 15:47:33.000000000 +0200 ++++ openacs-5.4.2/etc/config.tcl 2008-10-22 12:50:01.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) @@ -99,14 +99,21 @@ \ No newline at end of file +} diff -urNad openacs-5.4.2~/etc/daemontools/run openacs-5.4.2/etc/daemontools/run ---- openacs-5.4.2~/etc/daemontools/run 2008-08-07 09:39:40.000000000 +0200 -+++ openacs-5.4.2/etc/daemontools/run 2008-09-04 14:37:35.000000000 +0200 -@@ -9,7 +9,7 @@ +--- openacs-5.4.2~/etc/daemontools/run 2008-09-23 15:47:33.000000000 +0200 ++++ openacs-5.4.2/etc/daemontools/run 2008-10-22 12:51:54.000000000 +0200 +@@ -9,7 +9,14 @@ # see http://openacs.org/forums/message-view?message_id=176100 sleep 4 -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/openacs/config.tcl -u www-data -g www-data ++DAEMON="/usr/lib/aolserver4/bin/nsd" ++USER="www-data" ++GROUP="www-data" ++CONF="/etc/openacs/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]*//') ++ ++exec $DAEMON -it $CONF -u $USER -g $GROUP -b $ADDRESS:$PORT # For AOLserver 4 using privileged ports (usually < 1024), add the flag # -b youraddress:yourport to the nsd command