[CalendarServer-changes] [6075] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6075
          http://trac.macosforge.org/projects/calendarserver/changeset/6075
Author:   sagen at apple.com
Date:     2010-08-12 13:55:22 -0700 (Thu, 12 Aug 2010)
Log Message:
-----------
Gets addressbook server running again, by not colliding with calendar server's database directory and pid files

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/conf/carddavd-apple.plist

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-08-12 02:36:27 UTC (rev 6074)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-08-12 20:55:22 UTC (rev 6075)
@@ -1056,7 +1056,7 @@
             "-f", self.configFile,
             "-o", "ProcessType=Slave",
             "-o", "BindAddresses=%s" % (",".join(self.interfaces),),
-            "-o", "PIDFile=caldav-instance-%s.pid" % (self.id,),
+            "-o", "PIDFile=%s-instance-%s.pid" % (self.tapname, self.id,),
             "-o", "ErrorLogFile=None",
             "-o", "ErrorLogEnabled=False",
             "-o", "LogID=%s" % (self.id,),

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2010-08-12 02:36:27 UTC (rev 6074)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2010-08-12 20:55:22 UTC (rev 6075)
@@ -1039,7 +1039,7 @@
         slave = TwistdSlaveProcess("/path/to/twistd", "something", "config", 7, [])
         commandLine = slave.getCommandLine()
 
-        option = 'PIDFile=caldav-instance-7.pid'
+        option = 'PIDFile=something-instance-7.pid'
         self.assertIn(option, commandLine)
         self.assertEquals(commandLine[commandLine.index(option) - 1], '-o')
 

Modified: CalendarServer/trunk/conf/carddavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd-apple.plist	2010-08-12 02:36:27 UTC (rev 6074)
+++ CalendarServer/trunk/conf/carddavd-apple.plist	2010-08-12 20:55:22 UTC (rev 6075)
@@ -93,6 +93,10 @@
     <key>DataRoot</key>
     <string>Data</string>
 
+    <!-- Database root -->
+    <key>DatabseRoot</key>
+    <string>AddressbookDatabase</string>
+
     <!-- Document root -->
     <key>DocumentRoot</key>
     <string>Documents</string>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100812/7afc8f8a/attachment.html>