Index: openacs-4/etc/config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/config.tcl,v
diff -u -r1.19.2.9 -r1.19.2.10
--- openacs-4/etc/config.tcl 20 Jul 2004 20:50:08 -0000 1.19.2.9
+++ openacs-4/etc/config.tcl 23 Jul 2004 13:30:12 -0000 1.19.2.10
@@ -13,33 +13,27 @@
set httpport 8000
set httpsport 8443
-# If setting port below 1024 with AOLServer 4, read daemontools/run
-
# The hostname and address should be set to actual values.
-set hostname [ns_info hostname]
-set address [ns_info address]
+set hostname "www.thedesignexperience.org"
+set address 65.77.253.23
-# Note: If port is privileged (usually < 1024), OpenACS must be
-# started by root, and, in AOLserver 4, the run script have a
-# '-b address' flag which matches the address given above
+set server "openacs-5-1"
+set servername "the Design Experience"
-set server "service0"
-set servername "New OpenACS Installation - Development"
+set serverroot "/home/daveb/${server}"
-set serverroot "/var/lib/aolserver/${server}"
-
#---------------------------------------------------------------------
# which database do you want? postgres or oracle
set database postgres
-set db_name $server
+set db_name openacs-5-1
if { $database == "oracle" } {
set db_password "mysitepassword"
} else {
set db_host localhost
set db_port ""
- set db_user $server
+ set db_user daveb
}
#---------------------------------------------------------------------
@@ -58,17 +52,15 @@
ns_param nslog ${bindir}/nslog.so
ns_param nssha1 ${bindir}/nssha1.so
ns_param nscache ${bindir}/nscache.so
+ns_param nsrewrite ${bindir}/nsrewrite.so
-#nsrewrite is not used by any standard OpenACS code
-#ns_param nsrewrite ${bindir}/nsrewrite.so
-
#---------------------------------------------------------------------
# nsopenssl will fail unless the cert files are present as specified
# later in this file, so it's disabled by default
#ns_param nsopenssl ${bindir}/nsopenssl.so
# Full Text Search
-#ns_param nsfts ${bindir}/nsfts.so
+ns_param nsfts ${bindir}/nsfts.so
# PAM authentication
#ns_param nspam ${bindir}/nspam.so
@@ -147,16 +139,10 @@
ns_param logroll on
ns_param maxbackup 5
ns_param debug $debug
-#ns_param mailhost localhost
+#ns_param OutputCharset utf-8 ;# Default output charset. When none specified,
+ # no character encoding of output is performed.
+#ns_param URLCharset utf-8 ;# Default Charset for Url Encode/Decode.
-# Unicode by default:
-# see http://dqd.com/~mayoff/encoding-doc.html
-ns_param HackContentType 1
-ns_param DefaultCharset utf-8
-ns_param HttpOpenCharset utf-8
-ns_param OutputCharset utf-8
-ns_param URLCharset utf-8
-
#---------------------------------------------------------------------
# Thread library (nsthread) parameters
#---------------------------------------------------------------------
@@ -257,8 +243,6 @@
ns_param address $address
ns_param hostname $hostname
ns_param port $httpport
-ns_param maxinput [expr 5 * 1024 * 1024] ;# Maximum File Size for uploads in bytes
-ns_param recvwait [expr 5 * 60] ;# Maximum request time in minutes
#---------------------------------------------------------------------
#
@@ -418,7 +402,61 @@
ns_param hostname $hostname
ns_param address $address
+<<<<<<< config.tcl
+# NSD-driven connections:
+ns_param ServerPort $httpsport
+ns_param ServerHostname $hostname
+ns_param ServerAddress $address
+ns_param ServerCertFile certfile.pem
+ns_param ServerKeyFile keyfile.pem
+ns_param ServerProtocols "SSLv2, SSLv3, TLSv1"
+ns_param ServerCipherSuite "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP"
+ns_param ServerSessionCache false
+ns_param ServerSessionCacheID 1
+ns_param ServerSessionCacheSize 512
+ns_param ServerSessionCacheTimeout 300
+ns_param ServerPeerVerify true
+ns_param ServerPeerVerifyDepth 3
+ns_param ServerCADir ca
+ns_param ServerCAFile ca.pem
+ns_param ServerTrace false
+
+# For listening and accepting SSL connections via Tcl/C API:
+ns_param SockServerCertFile certfile.pem
+ns_param SockServerKeyFile keyfile.pem
+ns_param SockServerProtocols "SSLv2, SSLv3, TLSv1"
+ns_param SockServerCipherSuite "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP"
+ns_param SockServerSessionCache false
+ns_param SockServerSessionCacheID 2
+ns_param SockServerSessionCacheSize 512
+ns_param SockServerSessionCacheTimeout 300
+ns_param SockServerPeerVerify true
+ns_param SockServerPeerVerifyDepth 3
+ns_param SockServerCADir internal_ca
+ns_param SockServerCAFile internal_ca.pem
+ns_param SockServerTrace false
+
+# Outgoing SSL connections
+ns_param SockClientCertFile certfile.pem
+ns_param SockClientKeyFile keyfile.pem
+ns_param SockClientProtocols "SSLv2, SSLv3, TLSv1"
+ns_param SockClientCipherSuite "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP"
+ns_param SockClientSessionCache false
+ns_param SockClientSessionCacheID 3
+ns_param SockClientSessionCacheSize 512
+ns_param SockClientSessionCacheTimeout 300
+ns_param SockClientPeerVerify true
+ns_param SockServerPeerVerifyDepth 3
+ns_param SockClientCADir ca
+ns_param SockClientCAFile ca.pem
+ns_param SockClientTrace false
+
+# OpenSSL library support:
+#ns_param RandomFile /some/file
+ns_param SeedBytes 1024
+=======
}
+>>>>>>> 1.19.2.8
#---------------------------------------------------------------------
@@ -436,12 +474,6 @@
ns_param postgres ${bindir}/nspostgres.so ;# Load PostgreSQL driver
}
-if { $database == "oracle" } {
- ns_section "ns/db/driver/ora8"
- ns_param maxStringLogLength -1
- ns_param LobBufferSize 32768
-}
-
#
# Database Pools: This is how AOLserver ``talks'' to the RDBMS. You need
# three for OpenACS: main, log, subquery. Make sure to replace ``yourdb''
@@ -569,8 +601,8 @@
#---------------------------------------------------------------------
#ns_section "ns/server/${server}/module/nscgi"
-# ns_param map "GET /cgi-bin/ ${serverroot}/cgi-bin"
-# ns_param map "POST /cgi-bin/ ${serverroot}/cgi-bin"
+# ns_param map "GET /cgi-bin/ /web/$server/cgi-bin"
+# ns_param map "POST /cgi-bin/ /web/$server/cgi-bin"
# ns_param Interps CGIinterps
#ns_section "ns/interps/CGIinterps"
@@ -586,6 +618,7 @@
ns_section ns/server/${server}/module/nspam
ns_param PamDomain "pam_domain"
+
#---------------------------------------------------------------------
#
# WebDAV Support (optional, requires oacs-dav package to be installed
@@ -595,16 +628,15 @@
ns_section ns/server/${server}/tdav
ns_param propdir ${serverroot}/data/dav/properties
ns_param lockdir ${serverroot}/data/dav/locks
-ns_param defaultlocktimeout "300"
ns_section ns/server/${server}/tdav/shares
ns_param share1 "OpenACS"
#ns_param share2 "Share 2 description"
ns_section ns/server/${server}/tdav/share/share1
-ns_param uri "/*"
+ns_param uri "/dav/*"
# all WebDAV options
-ns_param options "OPTIONS COPY GET PUT MOVE DELETE HEAD MKCOL POST PROPFIND PROPPATCH LOCK UNLOCK"
+ns_param options "OPTIONS COPY GET PUT MOVE DELETE HEAD MKCOL POST PROPFIND PROPPATCH"
#ns_section ns/server/${server}/tdav/share/share2
#ns_param uri "/share2/path/*"
Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v
diff -u -r1.2.2.10 -r1.2.2.11
--- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 25 Apr 2004 14:08:25 -0000 1.2.2.10
+++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 23 Jul 2004 13:30:14 -0000 1.2.2.11
@@ -1501,7 +1501,7 @@
}
-proc tdav::apply_filters {{uri "/*"} {options "OPTIONS GET HEAD POST DELETE TRACE PROPFIND PROPPATCH COPY MOVE MKCOL LOCK UNLOCK"}} {
+proc tdav::apply_filters {{uri "/*"} {options "OPTIONS GET HEAD POST DELETE TRACE PROPFIND PROPPATCH COPY MOVE MKCOL LOCK UNLOCK"} {enable_filesystem "f"}} {
# Verify that the options are valid options. Webdav requires
# support for a minimum set of options. And offers support for a
@@ -1541,13 +1541,18 @@
# Register procedures for selected tDAV options. Do not register a
# proc for OPTIONS, GET, POST or HEAD.
- foreach option $options {
- if {[lsearch -exact [list OPTIONS GET POST HEAD] $option] < 0} {
- ns_log debug "tDAV registering proc for $uri on $option"
- ns_register_proc [string toupper $option] "${uri}" tdav::webdav_[string tolower $option]
+ if {[string equal "true" $enable_filesystem]} {
+
+ foreach option $options {
+ if {[lsearch -exact [list OPTIONS GET POST HEAD] $option] < 0} {
+ ns_log debug "tDAV registering proc for $uri on $option"
+ ns_register_proc [string toupper $option] "${uri}" tdav::webdav_[string tolower $option]
+ }
}
+ ns_log notice "tDAV: Registered procedures on $uri"
+ } else {
+ ns_log notice "tDAV: Filesystem access by WebDAV disabled"
}
- ns_log notice "tDAV: Registered procedures on $uri"
# Store the tDAV properties in an nsv set so that the registerd
# filters and procedures don't have to read the config file
# anymore.