[Supervisor-checkins] r900 - supervisor_manual/trunk/chapters

[Mike Naberezny]

Author: Mike Naberezny <mike at maintainable.com>
Date: Sat Oct 24 15:43:31 2009
New Revision: 900

Log:
Applied patch from Roger Hoover that documents new fcgi-program options.

Modified:
   supervisor_manual/trunk/chapters/configuration.xml

Modified: supervisor_manual/trunk/chapters/configuration.xml
==============================================================================
--- supervisor_manual/trunk/chapters/configuration.xml	(original)
+++ supervisor_manual/trunk/chapters/configuration.xml	Sat Oct 24 15:43:31 2009
@@ -1316,26 +1316,67 @@
     </para>
       
     <para>
-      <code>[fcgi-program:x]</code> sections have a single key which
+      <code>[fcgi-program:x]</code> sections have a few keys which
       <code>[program:x]</code> sections do not have.
     </para>
 
-    <variablelist>
-      <varlistentry>
-        <term>socket</term>
-        <listitem>
-          <para>
-            The FastCGI socket for this program, either TCP or UNIX domain
-            socket. For TCP sockets, use this format: 
-            <code>tcp://localhost:9002</code>.  For UNIX domain sockets, use
-            <code>unix:///absolute/path/to/file.sock</code>.  String
-            expressions are evaluated against a dictionary containing the keys
-            "program_name" and "here" (the directory of the supervisord config
-            file).
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <table>
+      <title><code>[fcgi-program:x]</code> Additional Values</title>
+      <tgroup cols="5">
+        <thead>
+          <row>
+            <entry>Key</entry>
+            <entry>Description</entry>
+            <entry>Default Value</entry>
+            <entry>Required</entry>
+            <entry>Introduced</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>socket</entry>
+            <entry>
+              The FastCGI socket for this program, either TCP or UNIX domain
+              socket. For TCP sockets, use this format: 
+              <code>tcp://localhost:9002</code>.  For UNIX domain sockets, use
+              <code>unix:///absolute/path/to/file.sock</code>.  String
+              expressions are evaluated against a dictionary containing the keys
+              "program_name" and "here" (the directory of the supervisord config
+              file).
+            </entry>
+            <entry>No default (required)</entry>
+            <entry>Yes</entry>
+            <entry>3.0</entry>
+          </row>
+
+          <row>
+            <entry>socket_owner</entry>
+            <entry>
+              For UNIX domain sockets only.  Sets the ownership for the 
+              FastCGI UNIX domain socket. May be a UNIX username (e.g. chrism)
+              or a UNIX username and group separated by a colon
+              (e.g. chrism:wheel).
+            </entry>
+            <entry>Use uid/gid of user the fcgi-program will run as.</entry>
+            <entry>No</entry>
+            <entry>3.0</entry>
+          </row>
+
+          <row>
+            <entry>socket_mode</entry>
+            <entry>
+              For UNIX domain sockets only. Sets the UNIX permission mode bits on the
+              FastCGI UNIX domain socket.
+            </entry>
+            <entry>
+              0700
+            </entry>
+            <entry>No</entry>
+            <entry>3.0</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
 
     <para>
       Consult <code>[program:x]</code> Section Values for allowable