[naviserver-commits] naviserver/tests test.nscfg,1.3,1.4

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614

Modified Files:
	test.nscfg 
Log Message:
Create seperate virtual servers for virtual host tests and custom
serverroot and conn host tests.


Index: test.nscfg
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/test.nscfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test.nscfg	18 Apr 2005 12:52:35 -0000	1.3
--- test.nscfg	27 Apr 2005 00:13:42 -0000	1.4
***************
*** 5,11 ****
  #
  
- set servername test
- 
- 
  
  #
--- 5,8 ----
***************
*** 14,18 ****
  
  ns_section "test"
- ns_param   servername      $servername
  ns_param   home            [pwd]/tests
  
--- 11,14 ----
***************
*** 29,35 ****
  
  #
! # Test server configuration.
  #
  
  ns_section "ns/parameters"
  ns_param   home            [ns_config "test" home]
--- 25,50 ----
  
  #
! # Global config.
  #
  
+ ns_section "ns/modules"
+ if {[ns_config "test" listenport]} {
+     ns_param   nssock      [ns_config "test" home]/../nssock/nssock.so
+ }
+ 
+ ns_section "ns/module/nssock"
+ ns_param   port            [ns_config "test" listenport]
+ ns_param   hostname        localhost
+ ns_param   address         127.0.0.1
+ ns_param   defaultserver   test
+ 
+ ns_section "ns/module/nssock/servers"
+ ns_param   test            test
+ ns_param   test            test:[ns_config "test" listenport]
+ ns_param   testvhost       testvhost
+ ns_param   testvhost       testvhost:[ns_config "test" listenport]
+ ns_param   testvhost2      testvhost2
+ ns_param   testvhost2      testvhost2:[ns_config "test" listenport]
+ 
  ns_section "ns/parameters"
  ns_param   home            [ns_config "test" home]
***************
*** 37,50 ****
  
  ns_section "ns/servers"
! ns_param   $servername     "Test Server"
  
! ns_section "ns/server/${servername}"
  ns_param   enabletclpages  true
  
! ns_section "ns/server/${servername}/fastpath"
  ns_param   serverdir       testserver
  ns_param   pagedir         pages
  
! ns_section "ns/server/${servername}/vhost"
  ns_param   enabled         true
  ns_param   hostprefix      vhosts
--- 52,99 ----
  
  ns_section "ns/servers"
! ns_param   testvhost       "Virtual Host Test Server"
! ns_param   testvhost2      "Virtual Host Test Server with custom procs"
! ns_param   test            "Main Test Server"
  
! 
! 
! 
! #
! # Main test server config.
! #
! 
! ns_section "ns/server/test"
  ns_param   enabletclpages  true
  
! ns_section "ns/server/test/fastpath"
  ns_param   serverdir       testserver
  ns_param   pagedir         pages
  
! ns_section "ns/server/test/tcl"
! ns_param   initfile        ../nsd/init.tcl
! ns_param   library         [ns_config "test" home]/testserver/modules
! 
! ns_section "ns/server/test/adp"
! ns_param   map             *.adp
! 
! ns_section "ns/server/test/adp/compress"
! ns_param   enable          yes
! ns_param   level           4
! ns_param   minsize         0
! 
! 
! 
! #
! # Virtual host test server config.
! #
! 
! ns_section "ns/server/testvhost"
! ns_param   enabletclpages  true
! 
! ns_section "ns/server/testvhost/fastpath"
! ns_param   serverdir       testserver
! ns_param   pagedir         pages
! 
! ns_section "ns/server/testvhost/vhost"
  ns_param   enabled         true
  ns_param   hostprefix      vhosts
***************
*** 53,67 ****
  ns_param   stripwww        yes
  
! ns_section "ns/server/${servername}/tcl"
  ns_param   initfile        ../nsd/init.tcl
  ns_param   library         [ns_config "test" home]/testserver/modules
  
- ns_section "ns/server/${servername}/module/nssock"
- ns_param   port            [ns_config "test" listenport]
- ns_param   hostname        localhost
- ns_param   address         127.0.0.1
  
! ns_section "ns/server/${servername}/modules"
! if {[ns_config "test" listenport]} {
!     ns_param   nssock      [ns_config "test" home]/../nssock/nssock.so
! }
--- 102,123 ----
  ns_param   stripwww        yes
  
! ns_section "ns/server/testvhost/tcl"
  ns_param   initfile        ../nsd/init.tcl
  ns_param   library         [ns_config "test" home]/testserver/modules
  
  
! 
! #
! # Custom location/serverroot proc test server config.
! #
! 
! ns_section "ns/server/testvhost2"
! ns_param   enabletclpages  true
! 
! ns_section "ns/server/testvhost2/fastpath"
! ns_param   serverdir       testserver
! ns_param   pagedir         pages
! 
! ns_section "ns/server/testvhost2/tcl"
! ns_param   initfile        ../nsd/init.tcl
! ns_param   library         [ns_config "test" home]/testserver/modules