[CalendarServer-changes] [6625] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6625
          http://trac.macosforge.org/projects/calendarserver/changeset/6625
Author:   dre at apple.com
Date:     2010-11-11 16:29:30 -0800 (Thu, 11 Nov 2010)
Log Message:
-----------
Use a private directory for RunRoot, which holds pid files and socket files, to ensure we can reap them at shutdown.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-11-12 00:13:34 UTC (rev 6624)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-11-12 00:29:30 UTC (rev 6625)
@@ -345,13 +345,13 @@
                 create=(0750, config.UserName, config.GroupName),
             )
 
-        if config.RunRoot.startswith(config.ServerRoot + os.sep):
-            self.checkDirectory(
-                config.RunRoot,
-                "Run root",
-                access=os.W_OK,
-                create=(0750, config.UserName, config.GroupName),
-            )
+        # Always create RunRoot (for pid files, socket files) if it does not exist
+        self.checkDirectory(
+            config.RunRoot,
+            "Run root",
+            access=os.W_OK,
+            create=(0770, config.UserName, config.GroupName),
+        )
 
         #
         # Nuke the file log observer's time format.

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2010-11-12 00:13:34 UTC (rev 6624)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2010-11-12 00:29:30 UTC (rev 6625)
@@ -114,7 +114,7 @@
 
     <!-- Run root -->
     <key>RunRoot</key>
-    <string>/var/run</string>
+    <string>/var/run/caldavd</string>
 
     <!-- Child aliases -->
     <key>Aliases</key>

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-11-12 00:13:34 UTC (rev 6624)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-11-12 00:29:30 UTC (rev 6625)
@@ -186,7 +186,7 @@
     "DocumentRoot"            : "Documents",
     "ConfigRoot"              : "/etc/caldavd",
     "LogRoot"                 : "/var/log/caldavd",
-    "RunRoot"                 : "/var/run",
+    "RunRoot"                 : "/var/run/caldavd",
     "UserQuota"               : 104857600, # User quota (in bytes)
     "MaximumAttachmentSize"   :   1048576, # Attachment size limit (in bytes)
     "MaxAttendeesPerInstance" :       100, # Maximum number of unique attendees
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101111/200cf9b1/attachment-0001.html>