about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-03-04 17:53:53 +0000
committerzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-03-04 17:53:53 +0000
commitec5d3f2b6c30e847d3e174d2b0d7bad7e0b1af60 (patch)
treed4e63ffd7d111cd4300281fe0c57ff5a6e8e4e2f
parentcaabee7221630877ff8a741a077031d4e9fcf5ad (diff)
downloadunicorn-ec5d3f2b6c30e847d3e174d2b0d7bad7e0b1af60.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@73 19e92222-5c0b-0410-8929-a290d50e31e9
-rw-r--r--doc/site/src/default.template2
-rw-r--r--doc/site/src/docs/lighttpd.page50
-rw-r--r--doc/site/src/faq.page26
-rw-r--r--doc/site/src/images/mongrel_not_scgi.jpgbin0 -> 19908 bytes
-rw-r--r--doc/site/src/news.page3
5 files changed, 70 insertions, 11 deletions
diff --git a/doc/site/src/default.template b/doc/site/src/default.template
index a769f92..a3053e8 100644
--- a/doc/site/src/default.template
+++ b/doc/site/src/default.template
@@ -48,7 +48,7 @@
         <dl>
           <dt>Mar-02-2006</dt>
           <dd>
-            <h5><a href="{relocatable: news.html}">Mongrel 0.3.7 -- Solid Rails, Win32, SwitchTower, Docs</a></h5>
+            <h5><a href="{relocatable: news.html}">Mongrel 0.3.7.1 -- Solid Rails, Win32, SwitchTower, Docs</a></h5>
 
             <p>A slightly longer time between releases but this is packed with lots of good
               things for people who want to run Mongrel. Highlights:  SwitchTower,
diff --git a/doc/site/src/docs/lighttpd.page b/doc/site/src/docs/lighttpd.page
index 1ffcda6..293dd14 100644
--- a/doc/site/src/docs/lighttpd.page
+++ b/doc/site/src/docs/lighttpd.page
@@ -164,11 +164,29 @@ including mod_rewrite, mod_memcache, mod_cml, and mod_redirect.
 * memcached
 * Finally make sure you configure with ./configure --with-lua --with-memcache
 
-This is especially important on Debian since even though they
-have the latest lighttpd they don't compile it with these options.
-On Debian I had to also modify the src/Makefile to remove some
-invalid library settings for Lua.   I'll let you figure those out.
-
+Debian people will need to follow these instructions from
+"www.debian-administration.org":http://www.debian-administration.org/articles/20
+for installing from source, and will also need to add these lines to your
+/etc/apt/sources.list:
+
+ deb-src http://http.us.debian.org/debian stable main contrib non-free
+ deb-src http://http.us.debian.org/debian unstable main contrib non-free
+ deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+
+And then do the following:
+
+# Make sure you don't have the source extracted in your current directory.
+# apt-get install devscripts debhelper build-essential fakeroot
+# apt-get update
+# apt-get source lighttpd
+# nano -w lighttpd-1.4.10/debian/rules
+## DEB_CONFIGURE_EXTRA_FLAGS need have at the end:  --with-lua --with-memcache
+# nano -w lighttpd-1.4.10/debian/lighttpd.install
+## debian/tmp/usr/lib/lighttpd/mod_cml.so needs to be added here.
+
+Then you're supposed to be able to follow the debian-administration
+docs but I haven't got it all working yet.  Please clue me in
+if you get this compiled on Debian.
 
 h3. lighttpd.conf
 
@@ -222,16 +240,32 @@ configured above.
 
 Now if you restart lighttpd and everything worked right you should
 be able to see the headers and tell if Mongrel or lighttpd is serving
-them.
+them.  Use curl like this:
 
+curl -I http://zedapp.railsmachine.net/
+curl -I http://zedapp.railsmachine.net/admin
+
+The second one should redirect and show a Mongrel header while the
+first one should show a lighttpd header.
 
-h2. Memcached
 
+h2. Memcached
 
+The next installment of this document will tell you how to setup a
+memcached so that you can run the lighttpd on a different server
+from the Mongrel cluster.  Right now they all have to reside
+on one machine.
 
 h2. CML Tricks
 
 Since Lua is a full blown and fast little language
-you can get pretty creative with it.
+you can get pretty creative with it.  For example you could
+have it check dates and times of files, look for processes
+that should be running, run commands, check the contents of
+a file, etc.
+
+Take a look at the "Lua Reference Manual":http://www.lua.org/manual/5.0/
+to see what it can do.  Ruby people will probably like Lua.
+
 
 
diff --git a/doc/site/src/faq.page b/doc/site/src/faq.page
index 05acca7..1c55d50 100644
--- a/doc/site/src/faq.page
+++ b/doc/site/src/faq.page
@@ -7,9 +7,33 @@ ordering: 5
 
 h1. FAQ
 
-
 h2. Design
 
+h3. Q: How does Mongrel relate to SCGI?
+
+Mongrel and SCGI are *completely unrelated* except for the fact that I wrote
+the SCGI Rails Runner and Mongrel.
+
+There has been some confusion by people as to how Mongrel and SCGI are related.  
+Some folks actually think that Mongrel uses SCGI to run Ruby on Rails or other
+web applications.  Their confusion can be summarized in this diagram:
+
+!images/mongrel_not_scgi.jpg!
+
+As you can see on the *right*, Ruby on Rails (and other web apps)
+run *inside* Mongrel as just straight Ruby code and are served
+using *regular HTTP*.  There are no:
+
+# Additional network protocols other than HTTP.
+# Started processes for each request.
+# External connectors or libraries required.
+# Additional server software.
+# Need for SCGI at all ever no way.
+
+In fact *you could drop lighttpd completely* from both diagrams and just serve
+your Mongrel server straight to the network.
+
+
 h3. Q: How is Mongrel designed?
 
 The design of Mongrel most closely matches "Simple":http://simpleweb.sourceforge.net/
diff --git a/doc/site/src/images/mongrel_not_scgi.jpg b/doc/site/src/images/mongrel_not_scgi.jpg
new file mode 100644
index 0000000..cdfd536
--- /dev/null
+++ b/doc/site/src/images/mongrel_not_scgi.jpg
Binary files differ
diff --git a/doc/site/src/news.page b/doc/site/src/news.page
index 1a0df09..5cbce8a 100644
--- a/doc/site/src/news.page
+++ b/doc/site/src/news.page
@@ -7,7 +7,7 @@ ordering: 2
 
 h1. Latest News
 
-h2.  Mar-03:  Mongrel 0.3.7 -- Solid Rails, Win32, SwitchTower, Docs
+h2.  Mar-03:  Mongrel 0.3.7.1 -- Solid Rails, Win32, SwitchTower, Docs
 
 A slightly longer time between releases but this is packed with lots of good
 things for people who want to run Mongrel.  We're talking Win32 CPU affinity,
@@ -25,6 +25,7 @@ you do one more network connection, but the other platforms work great.
 * Win32: New option that lets you set a mongrel service's CPU affinity.
 * Win32: Indicates default environment used for the services.
 * Win32: Avoids touching signals when on windows.
+* A fix for CGI encoding redirects wrong when SERVER_PORT isn't specified.
 * Tested on: Linux, Win32, FreeBSD, NetBSD, OSX.
 
 "Download 0.3.7":http://rubyforge.org/frs/?group_id=1306