[CalendarServer-changes] [6594] CalendarServer/branches/users/glyph/dont-start-postgres/ twistedcaldav/stdconfig.py

[source_changes at macosforge.org]

Revision: 6594
          http://trac.macosforge.org/projects/calendarserver/changeset/6594
Author:   glyph at apple.com
Date:     2010-11-10 18:52:46 -0800 (Wed, 10 Nov 2010)
Log Message:
-----------
New conf keys and values

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/dont-start-postgres/twistedcaldav/stdconfig.py

Modified: CalendarServer/branches/users/glyph/dont-start-postgres/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/glyph/dont-start-postgres/twistedcaldav/stdconfig.py	2010-11-11 02:52:29 UTC (rev 6593)
+++ CalendarServer/branches/users/glyph/dont-start-postgres/twistedcaldav/stdconfig.py	2010-11-11 02:52:46 UTC (rev 6594)
@@ -153,8 +153,18 @@
     "UseMetaFD"    : True, # Use a 'meta' FD, i.e. an FD to transmit other FDs
                            # to slave processes.
 
-    "UseDatabase"  : True, # True: postgres; False: files
+    "UseDatabase"  : True, # True: database; False: files
 
+    "DBType"       : "",   # 2 possible values: empty, meaning 'spawn postgres
+                           # yourself', or 'postgres', meaning 'connect to a
+                           # postgres database as specified by the 'DSN'
+                           # configuration key.  Will support more values in
+                           # the future.
+
+    "DSN"          : "",   # Data Source Name.  Used to connect to an external
+                           # database if DBType is non-empty.  Format varies
+                           # depending on database type.
+
     "DBAMPFD"      : 0,    # Internally used by database to tell slave
                            # processes to inherit a file descriptor and use it
                            # as an AMP connection over a UNIX socket; see
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101110/8c5405d6/attachment.html>