[CalendarServer-changes] [5087] CalendarServer/branches/users/cdaboo/relative-config-paths-5070

[source_changes at macosforge.org]

Revision: 5087
          http://trac.macosforge.org/projects/calendarserver/changeset/5087
Author:   cdaboo at apple.com
Date:     2010-02-10 12:57:53 -0800 (Wed, 10 Feb 2010)
Log Message:
-----------
Fix some paths for run and tests.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/relative-config-paths-5070/calendarserver/tap/caldav.py
    CalendarServer/branches/users/cdaboo/relative-config-paths-5070/conf/caldavd-test.plist
    CalendarServer/branches/users/cdaboo/relative-config-paths-5070/run
    CalendarServer/branches/users/cdaboo/relative-config-paths-5070/testcaldav

Modified: CalendarServer/branches/users/cdaboo/relative-config-paths-5070/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/cdaboo/relative-config-paths-5070/calendarserver/tap/caldav.py	2010-02-10 20:57:13 UTC (rev 5086)
+++ CalendarServer/branches/users/cdaboo/relative-config-paths-5070/calendarserver/tap/caldav.py	2010-02-10 20:57:53 UTC (rev 5087)
@@ -264,7 +264,19 @@
 
         self.parent["pidfile"] = config.PIDFile
 
+
         #
+        # Verify that server root actually exists
+        #
+        self.checkDirectory(
+            config.ServerRoot,
+            "Server root",
+            # Require write access because one might not allow editing on /
+            access=os.W_OK,
+            create=(0750, config.UserName, config.GroupName),
+        )
+        
+        #
         # Verify that document root, data root actually exist
         #
         self.checkDirectory(

Modified: CalendarServer/branches/users/cdaboo/relative-config-paths-5070/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/cdaboo/relative-config-paths-5070/conf/caldavd-test.plist	2010-02-10 20:57:13 UTC (rev 5086)
+++ CalendarServer/branches/users/cdaboo/relative-config-paths-5070/conf/caldavd-test.plist	2010-02-10 20:57:53 UTC (rev 5087)
@@ -95,7 +95,7 @@
 
     <!-- Run root -->
     <key>RunRoot</key>
-    <string>Tmp</string>
+    <string>Run</string>
 
     <!-- Child aliases -->
     <key>Aliases</key>

Modified: CalendarServer/branches/users/cdaboo/relative-config-paths-5070/run
===================================================================
--- CalendarServer/branches/users/cdaboo/relative-config-paths-5070/run	2010-02-10 20:57:13 UTC (rev 5086)
+++ CalendarServer/branches/users/cdaboo/relative-config-paths-5070/run	2010-02-10 20:57:53 UTC (rev 5087)
@@ -122,8 +122,8 @@
     fi;
 
     cd "${wd}";
-    if [ ! -d "${wd}/logs" ]; then
-      mkdir "${wd}/logs";
+    if [ ! -d "${wd}/data" ]; then
+      mkdir "${wd}/data";
     fi;
 
     echo "";

Modified: CalendarServer/branches/users/cdaboo/relative-config-paths-5070/testcaldav
===================================================================
--- CalendarServer/branches/users/cdaboo/relative-config-paths-5070/testcaldav	2010-02-10 20:57:13 UTC (rev 5086)
+++ CalendarServer/branches/users/cdaboo/relative-config-paths-5070/testcaldav	2010-02-10 20:57:53 UTC (rev 5087)
@@ -25,7 +25,7 @@
 
 verbose="";
 serverinfo="${cdt}/scripts/server/serverinfo.xml";
-documentroot="${wd}/twistedcaldav/test/data";
+documentroot="${wd}/data/Documents";
 
 usage ()
 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100210/690db6ec/attachment-0001.html>