Revision: 859 http://trac.macosforge.org/projects/calendarserver/changeset/859 Author: cdaboo@apple.com Date: 2006-12-19 08:46:17 -0800 (Tue, 19 Dec 2006) Log Message: ----------- Add cu-proxy configuration option. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd-test.plist CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd.plist CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/config.py Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd-test.plist =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd-test.plist 2006-12-19 16:29:36 UTC (rev 858) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd-test.plist 2006-12-19 16:46:17 UTC (rev 859) @@ -150,6 +150,9 @@ <key>NotificationsEnabled</key> <true/> + <key>CalendarUserProxyEnabled</key> + <true/> + <key>twistdLocation</key> <string>../Twisted/bin/twistd</string> Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd.plist =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd.plist 2006-12-19 16:29:36 UTC (rev 858) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/conf/caldavd.plist 2006-12-19 16:46:17 UTC (rev 859) @@ -99,6 +99,9 @@ <key>NotificationsEnabled</key> <true/> + <key>CalendarUserProxyEnabled</key> + <true/> + <key>SACLEnable</key> <true/> Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/config.py =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/config.py 2006-12-19 16:29:36 UTC (rev 858) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/config.py 2006-12-19 16:46:17 UTC (rev 859) @@ -23,6 +23,9 @@ defaultConfigFile = '/etc/caldavd/caldavd.plist' defaultConfig = { + 'AdminPrincipals': ['/principals/user/admin'], + 'AuthSchemes': ['Basic'], + 'CalendarUserProxyEnabled': True, 'DirectoryService': { 'params': {'node': '/Search'}, 'type': 'twistedcaldav.directory.appleopendirectory.OpenDirectoryService' @@ -36,6 +39,7 @@ 'PIDFile': '/var/run/caldavd.pid', 'Port': 8008, 'RunStandalone': True, + 'SACLEnable': False, 'SSLCertificate': '/etc/certificates/Default.crt', 'SSLEnable': True, 'SSLOnly': True, @@ -43,12 +47,9 @@ 'SSLPrivateKey': '/etc/certificates/Default.key', 'ServerLogFile': '/var/log/caldavd/server.log', 'ServerStatsFile': '/Library/CalendarServer/Documents/stats.plist', + 'twistdLocation': '/usr/share/caldavd/bin/twistd', 'UserQuotaBytes': 104857600, 'Verbose': False, - 'twistdLocation': '/usr/share/caldavd/bin/twistd', - 'SACLEnable': False, - 'AuthSchemes': ['Basic'], - 'AdminPrincipals': ['/principals/user/admin'] } class Config (object):