added man page for spawn-fcgi and add a example for conditionals and simple-vhost

git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@65 152afb58-edef-0310-8abb-c4023f1b3aa9

4 files changed, 49 insertions, 2 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d515024a..41a3d34b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-dist_man1_MANS=lighttpd.1
+dist_man1_MANS=lighttpd.1 spawn-fcgi.1
 
 
 DOCS=accesslog.txt \
diff --git a/doc/lighttpd.1 b/doc/lighttpd.1
index 1bfd2c54..308ed96e 100644
--- a/doc/lighttpd.1
+++ b/doc/lighttpd.1
@@ -15,4 +15,4 @@ CGI/1.1
 .SH SEE ALSO
 spawn-fcgi(1)
 .SH AUTHOR
-jan.kneschke@incremental.de
+jan@kneschke.de
diff --git a/doc/simple-vhost.txt b/doc/simple-vhost.txt
index b679296e..b0776f02 100644
--- a/doc/simple-vhost.txt
+++ b/doc/simple-vhost.txt
@@ -59,6 +59,40 @@ A small example should make this thinking clean: ::
 
 You can use symbolic links to map several hostnames to the same directory.
 
+Conditionals vs. simple-vhost
+-----------------------------
+
+You have to keep in mind that conditionals and simple-vhost interfere. ::
+
+  simple-vhost.server-root = "/var/www/servers/"
+  simple-vhost.default-host = "www.example.org"
+  simple-vhost.document-root = "pages"
+
+  $HTTP["host"] == "news.example.org" {
+    server.document-root = "/var/www/servers/news2.example.org/pages/"
+  } 
+
+Even if the ``server.document-root`` will be set to ``/var/www/servers/news2.example.org/pages/`` 
+if ``news.example.org`` is requested simple-vhost will overwrite ``server.document-root`` shortly
+afterwards.
+
+If ``/var/www/servers/news.example.org/pages/`` exists it will be taken, if not 
+``/var/www/servers/www.example.org/pages/`` will be taken as it is the default.
+
+To get them working in parallel you should use: ::
+
+  $HTTP["host"] !~ "^(news\.example\.org)$" {
+    simple-vhost.server-root = "/var/www/servers/"
+    simple-vhost.default-host = "www.example.org"
+    simple-vhost.document-root = "pages"
+  }
+
+  $HTTP["host"] == "news.example.org" {
+    server.document-root = "/var/www/servers/news2.example.org/pages/"
+  } 
+
+It will enable simple-vhosting for all host with are not named ``news.example.org``. 
+
 Options
 =======
 
diff --git a/doc/spawn-fcgi.1 b/doc/spawn-fcgi.1
new file mode 100644
index 00000000..2ad5bd9e
--- /dev/null
+++ b/doc/spawn-fcgi.1
@@ -0,0 +1,13 @@
+.TH SPAWNFCGI 1 2003-12-21
+.SH NAME
+spawn-fcgi \- spawning FastCGI processes
+.SH SYNOPSIS
+spawn-fcgi -f <fastcgi-binary> [-p <port> | -s <socket>] [-C <num-of-php-procs>] [-c <chroot-dir>] [-u <username>] [-g <groupname>]
+spawn-fcgi -v
+spawn-fcgi -h
+.SH DESCRIPTION
+spawn-fcgi is used to spawn remote FastCGI processes.
+.SH SEE ALSO
+lighttpd(1)
+.SH AUTHOR
+jan@kneschke.de