diff --git a/doc/latex/surflethowto.tex b/doc/latex/surflethowto.tex
index 52e55a0..78fa622 100644
--- a/doc/latex/surflethowto.tex
+++ b/doc/latex/surflethowto.tex
@@ -87,7 +87,7 @@ surflets:
does this for you:
\begin{itemize}
- \item \typew{cd \$sunet/httpd/surflets}
+ \item \typew{cd \$sunet}
\item \typew{SSAX=\$SSAX ./start-surflet-server}
\end{itemize}
@@ -96,15 +96,15 @@ Please be patient, scsh has to load a lot of libraries. If the
loading succeeds you will see something like this:
\begin{alltt}
-[andreas@hgt surflets]\$ ssax=/home/andreas/sw/SSAX ./start-surflet-server
+[andreas@hgt sunet]\$ SSAX=/home/andreas/sw/SSAX ./start-surflet-server
Loading...
reading options: ()
Going to run SUrflet server with:
- htdocs-dir: /home/andreas/sw/sunet/httpd/surflets/web-server/root/htdocs
- surflet-dir: /home/andreas/sw/sunet/httpd/surflets/web-server/root/surflets
- images-dir: /home/andreas/sw/sunet/httpd/surflets/web-server/root/img
+ htdocs-dir: /home/andreas/sw/sunet/web-server/root/htdocs
+ surflet-dir: /home/andreas/sw/sunet/web-server/root/surflets
+ images-dir: /home/andreas/sw/sunet/web-server/root/img
port: 8008
- log-file-name: /home/andreas/sw/sunet/httpd/surflets/web-server/httpd.log
+ log-file-name: /home/andreas/sw/sunet/web-server/httpd.log
a maximum of 5 simultaneous requests, syslogging activated,
and home-dir-handler (public_html) activated.
@@ -113,7 +113,8 @@ Going to run SUrflet server with:
This means the server is up and running. Try to connect to
\url{http://localhost:8008} with your browser and you will see the
-welcome page of the \surflets. You can also already try out some of
+welcome page of the SUnet server. There's a link to the
+\surflets homepage. You can also already try out some of the
\surflets that come with the distribution.
You will probably notice a long response time the first time you load
diff --git a/scheme/httpd/surflets/load-surflet-server.scm b/scheme/httpd/surflets/load-surflet-server.scm
index dc78fe0..c89c22a 100644
--- a/scheme/httpd/surflets/load-surflet-server.scm
+++ b/scheme/httpd/surflets/load-surflet-server.scm
@@ -10,22 +10,22 @@
(in 'scsh `(run (string-append
(or (getenv "SUNETHOME")
,*ASSUMED-SUNET-HOME*)
- "/packages.scm"))))
+ "/scheme/packages.scm"))))
(define *SSAX-PACKAGE*
(in 'scsh `(run (string-append
(or (getenv "SSAXPATH")
- (string-append ,*ASSUMED-SUNET-HOME* "/SSAX"))
+ (string-append ,*ASSUMED-SUNET-HOME* "/../SSAX"))
"/lib/packages.scm"))))
(define *SURFLET-PACKAGE*
(in 'scsh `(run (string-append
(or (getenv "SUNETHOME")
,*ASSUMED-SUNET-HOME*)
- "/httpd/surflets/packages.scm"))))
+ "/scheme/httpd/surflets/packages.scm"))))
(define *SURFLET-SERVER*
(in 'scsh `(run (string-append
(or (getenv "SUNETHOME")
,*ASSUMED-SUNET-HOME*)
- "/httpd/surflets/start-surflet-server"))))
+ "/start-surflet-server"))))
(config `(load ,*SUNET-PACKAGE*))
(config `(load ,*SSAX-PACKAGE*))
(config `(load ,*SURFLET-PACKAGE*))
diff --git a/scheme/httpd/surflets/start-surflet-server b/start-surflet-server
similarity index 95%
rename from scheme/httpd/surflets/start-surflet-server
rename to start-surflet-server
index 4f4471a..25ccca2 100755
--- a/scheme/httpd/surflets/start-surflet-server
+++ b/start-surflet-server
@@ -1,13 +1,12 @@
#!/bin/sh
echo "Loading..."
-fullpath=`which $0`
-# $sunet is either $SUNET or created out of fullpath
+# $sunetscheme is either $SUNET/scheme or $PWD/scheme
# Kind of a hack, I know. We're still waiting for this library
#installing system.
-sunethome=${SUNET:-`dirname $fullpath`/../..}
-ssaxhome=${SSAX:-`dirname $fullpath`/../../../SSAX} # path to SSAX
+sunetscheme=${SUNET:-$PWD}/scheme
+ssaxhome=${SSAX:-../SSAX} # path to SSAX
-exec scsh -lm $sunethome/packages.scm -lm $ssaxhome/lib/packages.scm -lm $sunethome/httpd/surflets/packages.scm -dm -o surflet-server -e main -s "$0" "$@"
+exec scsh -lm $sunetscheme/packages.scm -lm $ssaxhome/lib/packages.scm -lm $sunetscheme/httpd/surflets/packages.scm -dm -o surflet-server -e main -s "$0" "$@"
!#
(define-structure surflet-server
diff --git a/scheme/httpd/surflets/web-server/root/htdocs/index.html b/web-server/root/htdocs/index-surflet.html
similarity index 92%
rename from scheme/httpd/surflets/web-server/root/htdocs/index.html
rename to web-server/root/htdocs/index-surflet.html
index 378bea0..3009b13 100644
--- a/scheme/httpd/surflets/web-server/root/htdocs/index.html
+++ b/web-server/root/htdocs/index-surflet.html
@@ -4,7 +4,7 @@
Hello Untergrund!
- Main Menu
+ SUrflets Main Menu
Following files are available from here:
- And nothing else...
-
-Last modified: Sun Jul 13 18:23:23 CEST 2003
+Last modified: Mon Feb 2 11:33:08 EST 2004