[CalendarServer-changes] [6623] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6623
          http://trac.macosforge.org/projects/calendarserver/changeset/6623
Author:   sagen at apple.com
Date:     2010-11-11 16:09:31 -0800 (Thu, 11 Nov 2010)
Log Message:
-----------
Specifies new postgres DSN, adds new db setup script, and fixes mail sidecar setup

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/scheduling/imip.py

Added Paths:
-----------
    CalendarServer/trunk/contrib/create_caldavd_db.sh

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2010-11-11 21:54:51 UTC (rev 6622)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2010-11-12 00:09:31 UTC (rev 6623)
@@ -94,6 +94,12 @@
     <key>ServerRoot</key>
     <string>/Library/Server/Calendar and Contacts</string>
 
+    <!-- Database connection -->
+    <key>DBType</key>
+    <string>postgres</string>
+    <key>DSN</key>
+    <string>:caldav:caldav:::</string>
+
     <!-- Data root -->
     <key>DataRoot</key>
     <string>Data</string>

Added: CalendarServer/trunk/contrib/create_caldavd_db.sh
===================================================================
--- CalendarServer/trunk/contrib/create_caldavd_db.sh	                        (rev 0)
+++ CalendarServer/trunk/contrib/create_caldavd_db.sh	2010-11-12 00:09:31 UTC (rev 6623)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo Creating caldav database user
+/usr/bin/createuser --username=_postgres caldav --no-superuser --createdb --no-createrole || exit 1
+
+echo Creating caldav database
+/usr/bin/createdb --username=caldav caldav || exit 2
+
+echo Initializing caldav schema
+/usr/bin/psql -U caldav -f /usr/share/caldavd/lib/python/txdav/common/datastore/sql_schema_v1.sql || exit 3
+
+exit 0


Property changes on: CalendarServer/trunk/contrib/create_caldavd_db.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2010-11-11 21:54:51 UTC (rev 6622)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2010-11-12 00:09:31 UTC (rev 6623)
@@ -593,12 +593,17 @@
     """
 
     def __init__(self, settings, mailer):
+        service.MultiService.__init__(self)
         self.settings = settings
         self.mailer = mailer
 
+        # Disable since we're only interested in /principals (for auth)
+        config.EnableCalDAV = False
+        config.EnableCardDAV = False
+
         rootResource = getRootResource(
             config,
-            self,
+            "IGNORED", # no need for a store - no /calendars nor /addressbooks
             (
                 ("inbox", IMIPInvitationInboxResource, (mailer,), "digest"),
             )

Modified: CalendarServer/trunk/twistedcaldav/scheduling/imip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/imip.py	2010-11-11 21:54:51 UTC (rev 6622)
+++ CalendarServer/trunk/twistedcaldav/scheduling/imip.py	2010-11-12 00:09:31 UTC (rev 6623)
@@ -78,7 +78,7 @@
                     if not toAddr.startswith("mailto:"):
                         raise ValueError("ATTENDEE address '%s' must be mailto: for iMIP operation." % (toAddr,))
 
-                    fromAddr = self.scheduler.originator.cuaddr
+                    fromAddr = str(self.scheduler.originator.cuaddr)
 
                     log.debug("POSTing iMIP message to gateway...  To: '%s', From :'%s'\n%s" % (toAddr, fromAddr, caldata,))
                     yield self.postToGateway(fromAddr, toAddr, caldata)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101111/4fe461fe/attachment.html>