Revision: 830 http://trac.macosforge.org/projects/calendarserver/changeset/830 Author: wsanchez@apple.com Date: 2006-12-14 17:17:18 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Configuration fixes: * Remove unused options from defaults * Fix admin principal location * Honor SSLOnly option. Submitted by: strauss@ibr.cs.tu-bs.de Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2006-12-15 01:04:48 UTC (rev 829) +++ CalendarServer/trunk/twistedcaldav/config.py 2006-12-15 01:17:18 UTC (rev 830) @@ -23,7 +23,6 @@ defaultConfigFile = '/etc/caldavd/caldavd.plist' defaultConfig = { - 'CreateAccounts': False, 'DirectoryService': { 'params': {'node': '/Search'}, 'type': 'twistedcaldav.directory.appleopendirectory.OpenDirectoryService' @@ -36,7 +35,6 @@ 'NotificationsEnabled': False, 'PIDFile': '/var/run/caldavd.pid', 'Port': 8008, - 'ResetAccountACLs': False, 'RunStandalone': True, 'SSLCertificate': '/etc/certificates/Default.crt', 'SSLEnable': True, @@ -50,7 +48,7 @@ 'twistdLocation': '/usr/share/caldavd/bin/twistd', 'SACLEnable': False, 'AuthSchemes': ['Basic'], - 'AdminPrincipals': ['/principal/users/admin'] + 'AdminPrincipals': ['/principals/user/admin'] } class Config (object): Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-15 01:04:48 UTC (rev 829) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-15 01:17:18 UTC (rev 830) @@ -182,9 +182,8 @@ service = Web2Service(logObserver) - httpService = internet.TCPServer( - int(config.Port), - channel) + if not config.SSLOnly: + httpService = internet.TCPServer(int(config.Port), channel) httpService.setServiceParent(service)