Adapt to new server layout. File is only meant for developing.

scheme/httpd/surflets/load-surflet-server.scm

@@ -1,35 +1,16 @@
-; reads package description in the right order
-; in the end, the server can be started via (server)
+;;; This file is meant for developing.  Use the example startup
+;;; scripts to start the webserver,
+;;; e.g. $SCSH_LIB_DIRS/sunet/web-server/start-surflet-server
+
+;;; Reads package descriptions in the right order.  In the end, the
+;;; server can be started via SERVER. Assumes scsh has been started with
+;;; SSAX loaded: scsh -lel SSAX/load.scm (otherwise surflets won't work)
+;;; and it is called with cwd=sunet/scheme/httpd/surflets/
 
 (batch 'on)
-(define *ASSUMED-SUNET-HOME*
-  (in 'scsh '(run (match:substring 
-		   (regexp-search (rx (submatch (* any) "sunet")) (cwd))
-		   1))))
-(define *SUNET-PACKAGE* 
-  (in 'scsh `(run (string-append 
-		   (or (getenv "SUNETHOME")
-		       ,*ASSUMED-SUNET-HOME*)
-		   "/scheme/packages.scm"))))
-(define *SSAX-PACKAGE* 
-  (in 'scsh `(run (string-append
-		   (or (getenv "SSAXPATH")
-		       (string-append ,*ASSUMED-SUNET-HOME* "/../SSAX"))
-		   "/lib/packages.scm"))))
-(define *SURFLET-PACKAGE* 
-  (in 'scsh `(run (string-append 
-		   (or (getenv "SUNETHOME")
-		       ,*ASSUMED-SUNET-HOME*)
-		   "/scheme/httpd/surflets/packages.scm"))))
-(define *SURFLET-SERVER*
-  (in 'scsh `(run (string-append 
-		   (or (getenv "SUNETHOME")
-		       ,*ASSUMED-SUNET-HOME*)
-		   "/start-surflet-server"))))
-(config `(load ,*SUNET-PACKAGE*))
-(config `(load ,*SSAX-PACKAGE*))
-(config `(load ,*SURFLET-PACKAGE*))
-(config `(load ,*SURFLET-SERVER*))
+(config `(load "../../packages.scm"))
+(config `(load "packages.scm"))
+(config `(load "../../../web-server/start-surflet-server"))
 (user)
 (open 'surflet-server)
 (batch 'off)