[CalendarServer-changes] [5559] CalDAVTester/trunk/odsetup.py

source_changes at macosforge.org source_changes at macosforge.org
Mon May 3 17:06:32 PDT 2010


Revision: 5559
          http://trac.macosforge.org/projects/calendarserver/changeset/5559
Author:   dre at apple.com
Date:     2010-05-03 17:06:31 -0700 (Mon, 03 May 2010)
Log Message:
-----------
Fixed odsetup.py to adapt to changes in the default caldavd.plist

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2010-05-03 23:54:33 UTC (rev 5558)
+++ CalDAVTester/trunk/odsetup.py	2010-05-04 00:06:31 UTC (rev 5559)
@@ -149,10 +149,26 @@
     @param config: file path to caldavd.plist
     @type config: str
     """
+
+    # SudoersFile was removed from the default caldavd.plist. Cope.
     plist = readPlist(config)
+    try: plist["SudoersFile"]
+    except KeyError:
+	# add SudoersFile entry to caldavd.plist
+        plist["SudoersFile"] = "/etc/caldavd/sudoers.plist"
+        writePlist(plist,config)
+
+    try: sudoerspl = readPlist('/etc/caldavd/sudoers.plist')
+    except IOError:
+        # create a new sudoers.plist with empty 'users' array
+        sudoerspl = {'users': []}
+        writePlist(sudoerspl,'/etc/caldavd/sudoers.plist')
+
+    plist = readPlist(config)
     hostname = plist["ServerHostName"]
     docroot = plist["DocumentRoot"]
     sudoers = plist["SudoersFile"]
+    
     try:
         basic_ok = plist["Authentication"]["Basic"]["Enabled"]
     except KeyError:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100503/45563c01/attachment.html>


More information about the calendarserver-changes mailing list