December 2006 - calendarserver-changes

[871] CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/ resource.py
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 871 http://trac.macosforge.org/projects/calendarserver/changeset/871 Author: cdaboo(a)apple.com Date: 2006-12-20 13:09:49 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Remove useless export. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/resource.py Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/resource.py =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/resource.py 2006-12-20 21:06:22 UTC (rev 870) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/resource.py 2006-12-20 21:09:49 UTC (rev 871) @@ -24,7 +24,6 @@ "CalDAVResource", "CalendarPrincipalCollectionResource", "CalendarPrincipalResource", - "CalendarSchedulingCollectionResource", "isCalendarCollectionResource", "isPseudoCalendarCollectionResource", ]

1 0

[870] CalendarServer/branches/users/dreid/cluster
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 870 http://trac.macosforge.org/projects/calendarserver/changeset/870 Author: dreid(a)apple.com Date: 2006-12-20 13:06:22 -0800 (Wed, 20 Dec 2006) Log Message: ----------- The simplest thing that could possibly work with regards to cluster support Modified Paths: -------------- CalendarServer/branches/users/dreid/cluster/conf/caldavd-test.plist CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist CalendarServer/branches/users/dreid/cluster/run CalendarServer/branches/users/dreid/cluster/twisted/plugins/caldav.py CalendarServer/branches/users/dreid/cluster/twistedcaldav/config.py CalendarServer/branches/users/dreid/cluster/twistedcaldav/tap.py Added Paths: ----------- CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py Modified: CalendarServer/branches/users/dreid/cluster/conf/caldavd-test.plist =================================================================== --- CalendarServer/branches/users/dreid/cluster/conf/caldavd-test.plist 2006-12-20 19:59:24 UTC (rev 869) +++ CalendarServer/branches/users/dreid/cluster/conf/caldavd-test.plist 2006-12-20 21:06:22 UTC (rev 870) @@ -166,5 +166,29 @@ <string>/principals/user/admin</string> </array> + <key>ClusterEnable</key> + <false/> + + <key>Cluster</key> + <dict> + <key>processes</key> + <integer>0</integer> + + <key>scheduler</key> + <string>leastconns</string> + + <key>admin</key> + <dict> + <key>username</key> + <string></string> + + <key>password</key> + <string></string> + </dict> + + <key>pydirLocation</key> + <string>/usr/share/caldavd/bin/pydir++.py</string> + + </dict> </dict> </plist> Modified: CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist =================================================================== --- CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist 2006-12-20 19:59:24 UTC (rev 869) +++ CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist 2006-12-20 21:06:22 UTC (rev 870) @@ -112,5 +112,28 @@ <string>/principals/user/admin</string> </array> + <key>ClusterEnable</key> + <false/> + + <key>Cluster</key> + <dict> + <key>processes</key> + <integer>0</integer> + + <key>scheduler</key> + <string>leastconns</string> + + <key>admin</key> + <dict> + <key>username</key> + <string></string> + + <key>password</key> + <string></string> + </dict> + + <key>pydirLocation</key> + <string>/usr/share/caldavd/bin/pydir++.py</string> + </dict> </dict> </plist> Modified: CalendarServer/branches/users/dreid/cluster/run =================================================================== --- CalendarServer/branches/users/dreid/cluster/run 2006-12-20 19:59:24 UTC (rev 869) +++ CalendarServer/branches/users/dreid/cluster/run 2006-12-20 21:06:22 UTC (rev 870) @@ -527,6 +527,20 @@ fi; # +# PyDirector +# + +if ! py_have_module pydirector; then + pydirector="${top}/pydirector-1.0.0"; + + www_get "PyDirector" "${pydirector}" http://easynews.dl.sourceforge.net/sourceforge/pythondirector/pydirector-1.…; + py_build "PyDirector" "${pydirector}" false; + py_install "PyDirector" "${pydirector}"; + + export PYTHONPATH="${PYTHONPATH}:${pydirector}/build/${py_platform_libdir}"; +fi; + +# # TwistedCalDAV # Modified: CalendarServer/branches/users/dreid/cluster/twisted/plugins/caldav.py =================================================================== --- CalendarServer/branches/users/dreid/cluster/twisted/plugins/caldav.py 2006-12-20 19:59:24 UTC (rev 869) +++ CalendarServer/branches/users/dreid/cluster/twisted/plugins/caldav.py 2006-12-20 21:06:22 UTC (rev 870) @@ -1,3 +1,5 @@ from twistedcaldav.tap import CaldavServiceMaker +from twistedcaldav.cluster import ClusterServiceMaker TwistedCalDAV = CaldavServiceMaker() +TwistedCalDAVCluster = ClusterServiceMaker() Added: CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py =================================================================== --- CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py (rev 0) +++ CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py 2006-12-20 21:06:22 UTC (rev 870) @@ -0,0 +1,152 @@ +import os +import tempfile +import socket + +from twisted.runner import procmon + +from twisted.python import usage + +from twistedcaldav.config import config +from twistedcaldav.tap import CaldavOptions, CaldavServiceMaker + +serviceTemplate = """ + <service name="%(name)s"> + <listen ip="127.0.0.1:%(port)s" /> + <group name="main" scheduler="%(scheduler)s"> + %(hosts)s + </group> + <enable group="main" /> + </service> +""" + +configTemplate = """ +<pdconfig> + %(services)s + <admin listen="localhost:7001"> + <user name="%(username)s" password="%(password)s" access="full"/> + </admin> + <logging file="pydir.log"/> +</pdconfig> +""" + +hostTemplate = '<host name="%(name)s" ip="127.0.0.1:%(port)s" />' + +twistdTemplate = ('%(twistd)s caldav -f %(configFile)s ' + '-o Port=%(port)s -o SSLPort=%(sslPort)s') + +class TwistdSlaveProcess(object): + prefix = "caldav" + + def __init__(self, twistdLocation, configFile, port, sslPort): + self.twistd = twistdLocation + + self.configFile = configFile + + self.port = port + self.sslPort = sslPort + + self.pidFile = os.path.join( + os.path.dirname(config.PIDFile), + '%s.pid' % (self.getName(),)) + + def getName(self): + return '%s-%s' % (self.prefix, self.port) + + def getSSLName(self): + return '%s-%s' % (self.prefix, self.sslPort) + + def getCommandLine(self): + return [self.twistd, '-n', 'caldav', + '-f', self.configFile, + '-o', 'Port=%s' % (self.port,), + '-o', 'SSLPort=%s' % (self.sslPort,), + '-o', 'PIDFile=%s' % (self.pidFile,)] + + def getHostLine(self, ssl=None): + name = self.getName() + port = self.port + if ssl: + name = self.getSSLName() + port = self.sslPort + + return hostTemplate % {'name': name, + 'port': port} + + +class ClusterServiceMaker(CaldavServiceMaker): + tapname = "caldavcluster" + + description = "A cluster of Calendar Servers" + + def makeService(self, options): + _twistdTemplate = twistdTemplate % { + 'twistd': config.twistdLocation, + 'configFile': options['config'], + 'port': '%(port)s', + 'sslPort': '%(sslPort)s', + } + + if not config.ClusterEnable: + raise usage.UsageError( + ("Clustering is not enabled in the config " + "file, use -o ClusterEnable=True to " + "override, or use --degrade")) + + service = procmon.ProcessMonitor() + + hosts = [] + sslHosts = [] + + port = config.Port + sslport = config.SSLPort + + for p in xrange(0, config.Cluster['processes']): + port += 1 + sslport += 1 + + process = TwistdSlaveProcess(config.twistdLocation, + options['config'], + port, sslport) + + service.addProcess(process.getName(), + process.getCommandLine(), + uid=options.parent['uid'], + gid=options.parent['gid']) + + hosts.append(process.getHostLine()) + + if config.SSLEnable: + sslHosts.append(process.getHostLine(ssl=True)) + + services = [] + + services.append(serviceTemplate % { + 'name': 'http', + 'port': config.Port, + 'scheduler': config.Cluster['scheduler'], + 'hosts': '\n'.join(hosts) + }) + + + if config.SSLEnable: + services.append(serviceTemplate % { + 'name': 'https', + 'port': config.SSLPort, + 'scheduler': config.Cluster['scheduler'], + 'hosts': '\n'.join(sslHosts), + }) + + pdconfig = configTemplate % { + 'services': '\n'.join(services), + 'username': config.Cluster['admin']['username'], + 'password': config.Cluster['admin']['password'], + } + + fd, fname = tempfile.mkstemp(prefix='pydir') + os.write(fd, pdconfig) + os.close(fd) + + service.addProcess('pydir', [config.Cluster['pydirLocation'], + fname]) + + return service Modified: CalendarServer/branches/users/dreid/cluster/twistedcaldav/config.py =================================================================== --- CalendarServer/branches/users/dreid/cluster/twistedcaldav/config.py 2006-12-20 19:59:24 UTC (rev 869) +++ CalendarServer/branches/users/dreid/cluster/twistedcaldav/config.py 2006-12-20 21:06:22 UTC (rev 870) @@ -48,8 +48,18 @@ 'twistdLocation': '/usr/share/caldavd/bin/twistd', 'SACLEnable': False, 'AuthSchemes': ['Basic'], - 'AdminPrincipals': ['/principals/user/admin'] -} + 'AdminPrincipals': ['/principals/user/admin'], + 'ClusterEnable': Trueb, + 'Cluster': { + 'processes': 10, + 'scheduler': 'leastconns', + 'admin': { + 'username': None, + 'password': None, + }, + 'pydirLocation': '/usr/share/caldavd/bin/pydir++.py', + }, + } class Config (object): def __init__(self, defaults): Modified: CalendarServer/branches/users/dreid/cluster/twistedcaldav/tap.py =================================================================== --- CalendarServer/branches/users/dreid/cluster/twistedcaldav/tap.py 2006-12-20 19:59:24 UTC (rev 869) +++ CalendarServer/branches/users/dreid/cluster/twistedcaldav/tap.py 2006-12-20 21:06:22 UTC (rev 870) @@ -80,7 +80,7 @@ elif isinstance(defaultConfig[key], (int, float, long)): value = type(defaultConfig[key])(value) - elif isinstance(defaultConfig[key], (list, tuples)): + elif isinstance(defaultConfig[key], (list, tuple)): value = value.split(',') elif isinstance(defaultConfig[key], dict): @@ -104,6 +104,7 @@ self.parent['logfile'] = config.ErrorLogFile self.parent['pidfile'] = config.PIDFile + class CaldavServiceMaker(object): implements(IPlugin, service.IServiceMaker)

1 0

[869] CalendarServer/branches/users/dreid/cluster/
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 869 http://trac.macosforge.org/projects/calendarserver/changeset/869 Author: dreid(a)apple.com Date: 2006-12-20 11:59:24 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Branching to 'users/dreid/cluster' Added Paths: ----------- CalendarServer/branches/users/dreid/cluster/ Copied: CalendarServer/branches/users/dreid/cluster (from rev 868, CalendarServer/trunk)

1 0

[868] CalendarServer/branches/users/dreid/
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 868 http://trac.macosforge.org/projects/calendarserver/changeset/868 Author: dreid(a)apple.com Date: 2006-12-20 11:55:55 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Make a user directory. Added Paths: ----------- CalendarServer/branches/users/dreid/

1 0

[867] CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/ calendaruserproxy.py
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 867 http://trac.macosforge.org/projects/calendarserver/changeset/867 Author: cdaboo(a)apple.com Date: 2006-12-20 10:55:19 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Provision the proxy principal collections below each primary principal. Added Paths: ----------- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/calendaruserproxy.py Added: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/calendaruserproxy.py =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/calendaruserproxy.py (rev 0) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/calendaruserproxy.py 2006-12-20 18:55:19 UTC (rev 867) @@ -0,0 +1,194 @@ +## +# Copyright (c) 2006 Apple Computer, Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# DRI: Wilfredo Sanchez, wsanchez(a)apple.com +## +from twisted.internet.defer import succeed +from twistedcaldav.extensions import ReadOnlyResourceMixIn +from twisted.web2.http import Response + +""" +Implements a calendar user proxy principal. +""" + +__all__ = [ + "CalendarUserProxyPrincipalResource", +] + +from urllib import unquote + +from twisted.python import log +from twisted.python.failure import Failure +from twisted.web2 import responsecode +from twisted.web2.http_headers import MimeType +from twisted.web2.dav import davxml +from twisted.web2.dav.util import joinURL + +from twistedcaldav.extensions import DAVFile +from twistedcaldav.resource import CalendarPrincipalResource +from twistedcaldav.static import AutoProvisioningFileMixIn + +class PermissionsMixIn (ReadOnlyResourceMixIn): + def defaultAccessControlList(self): + return authReadACL + + def accessControlList(self, request, inheritance=True, expanding=False, inherited_aces=None): + # Permissions here are fixed, and are not subject to inherritance rules, etc. + return succeed(self.defaultAccessControlList()) + +class CalendarUserProxyPrincipalResource (AutoProvisioningFileMixIn, PermissionsMixIn, CalendarPrincipalResource, DAVFile): + """ + Calendar user proxy principal resource. + """ + def __init__(self, path, parent, type): + """ + @param path: them path to the file which will back this resource. + @param parent: the parent of this resource. + @param type: the L{IDirectoryRecord} that this resource represents. + """ + super(CalendarUserProxyPrincipalResource, self).__init__(path, joinURL(parent.principalURL(), type)) + + self.parent = parent + self.type = type + self._url = joinURL(parent.principalURL(), type) + if self.isCollection(): + self._url += "/" + + # Provision in __init__() because principals are used prior to request + # lookups. + self.provision() + + def resourceType(self): + if self.type == "calendar-proxy-read": + return davxml.ResourceType.calendarproxyread + elif self.type == "calendar-proxy-write": + return davxml.ResourceType.calendarproxywrite + else: + return super(CalendarUserProxyPrincipalResource, self).resourceType() + + ## + # HTTP + ## + + def render(self, request): + def format_list(method, *args): + def genlist(): + try: + item = None + for item in method(*args): + yield " -> %s\n" % (item,) + if item is None: + yield " '()\n" + except Exception, e: + log.err("Exception while rendering: %s" % (e,)) + Failure().printTraceback() + yield " ** %s **: %s\n" % (e.__class__.__name__, e) + return "".join(genlist()) + + output = [ + """<html>""" + """<head>""" + """<title>%(title)s</title>""" + """<style>%(style)s</style>""" + """</head>""" + """<body>""" + """<div class="directory-listing">""" + """<h1>Proxy Principal Details</h1>""" + """<pre><blockquote>""" + % { + "title": unquote(request.uri), + "style": self.directoryStyleSheet(), + } + ] + + output.append("".join(( + "Directory Information\n" + "---------------------\n" + "Parent Directory GUID: %s\n" % (self.parent.record.service.guid,), + "Realm: %s\n" % (self.parent.record.service.realmName,), + "\n" + "Parent Principal Information\n" + "---------------------\n" + "GUID: %s\n" % (self.parent.record.guid,), + "Record type: %s\n" % (self.parent.record.recordType,), + "Short name: %s\n" % (self.parent.record.shortName,), + "Full name: %s\n" % (self.parent.record.fullName,), + "\n" + "Proxy Principal Information\n" + "---------------------\n" + "Principal URL: %s\n" % (self.principalURL(),), + "\nAlternate URIs:\n" , format_list(self.alternateURIs), + "\nGroup members:\n" , format_list(self.groupMembers), + ))) + + output.append( + """</pre></blockquote></div>""" + ) + + output.append(self.getDirectoryTable("Collection Listing")) + + output.append("</body></html>") + + output = "".join(output) + if type(output) == unicode: + output = output.encode("utf-8") + mime_params = {"charset": "utf-8"} + else: + mime_params = {} + + response = Response(code=responsecode.OK, stream=output) + response.headers.setHeader("content-type", MimeType("text", "html", mime_params)) + + return response + + ## + # DAV + ## + + def displayName(self): + return self.type + + ## + # ACL + ## + + def alternateURIs(self): + # FIXME: Add API to IDirectoryRecord for getting a record URI? + return () + + def principalURL(self): + return self._url + + def groupMembers(self): + return () + + def groupMemberships(self): + return () + + def principalCollections(self): + return self.parent.principalCollections() + +## +# Utilities +## + +authReadACL = davxml.ACL( + # Read access for authenticated users. + davxml.ACE( + davxml.Principal(davxml.Authenticated()), + davxml.Grant(davxml.Privilege(davxml.Read())), + davxml.Protected(), + ), +)

1 0

[866] CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 866 http://trac.macosforge.org/projects/calendarserver/changeset/866 Author: cdaboo(a)apple.com Date: 2006-12-20 10:54:57 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Provision the proxy principal collections below each primary principal. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/customxml.py CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/principal.py Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/customxml.py =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/customxml.py 2006-12-20 18:54:40 UTC (rev 865) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/customxml.py 2006-12-20 18:54:57 UTC (rev 866) @@ -52,6 +52,22 @@ def getValue(self): return str(self) +class CalendarProxyRead (davxml.WebDAVEmptyElement): + """ + A read-only calendar user proxy principal resource. + (Apple Extension to CalDAV) + """ + namespace = calendarserver_namespace + name = "calendar-proxy-read" + +class CalendarProxyWrite (davxml.WebDAVEmptyElement): + """ + A read-write calendar user proxy principal resource. + (Apple Extension to CalDAV) + """ + namespace = calendarserver_namespace + name = "calendar-proxy-write" + class TwistedCalendarPrincipalURI(davxml.WebDAVTextElement): """ Contains the calendarPrincipalURI value for a directory record corresponding to a principal. @@ -183,3 +199,5 @@ davxml.ResourceType.dropboxhome = davxml.ResourceType(davxml.Collection(), DropBoxHome()) davxml.ResourceType.dropbox = davxml.ResourceType(davxml.Collection(), DropBox()) davxml.ResourceType.notifications = davxml.ResourceType(davxml.Collection(), Notifications()) +davxml.ResourceType.calendarproxyread = davxml.ResourceType(davxml.Principal(), davxml.Collection(), CalendarProxyRead()) +davxml.ResourceType.calendarproxywrite = davxml.ResourceType(davxml.Principal(), davxml.Collection(), CalendarProxyWrite()) Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/principal.py =================================================================== --- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/principal.py 2006-12-20 18:54:40 UTC (rev 865) +++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/principal.py 2006-12-20 18:54:57 UTC (rev 866) @@ -37,6 +37,8 @@ from twisted.web2.dav import davxml from twisted.web2.dav.util import joinURL +from twistedcaldav.config import config +from twistedcaldav.calendaruserproxy import CalendarUserProxyPrincipalResource from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVFile from twistedcaldav.resource import CalendarPrincipalCollectionResource, CalendarPrincipalResource from twistedcaldav.static import AutoProvisioningFileMixIn @@ -426,6 +428,29 @@ else: return None + ## + # Static + ## + + def createSimilarFile(self, path): + log.err("Attempt to create clone %r of resource %r" % (path, self)) + raise HTTPError(responsecode.NOT_FOUND) + + def getChild(self, name, record=None): + if name == "": + return self + + if config.CalendarUserProxyEnabled and name in ("calendar-proxy-read", "calendar-proxy-write"): + return CalendarUserProxyPrincipalResource(self.fp.child(name).path, self, name) + else: + return None + + def listChildren(self): + if config.CalendarUserProxyEnabled: + return ("calendar-proxy-read", "calendar-proxy-write") + else: + return () + ## # Utilities ##

1 0

[865] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 865 http://trac.macosforge.org/projects/calendarserver/changeset/865 Author: wsanchez(a)apple.com Date: 2006-12-20 10:54:40 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Indent httpService.setServiceParent(service) into correct scope Fixes #110 Submitted by strauss(a)ibr.cs.tu-bs.de Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-20 02:26:46 UTC (rev 864) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-20 18:54:40 UTC (rev 865) @@ -188,9 +188,10 @@ realm = directory.realmName or "" # TODO: figure out the list of supported schemes from the directory - schemes = {'basic': basic.BasicCredentialFactory(realm), - 'digest': digest.DigestCredentialFactory("md5", realm), - } + schemes = { + "basic" : basic.BasicCredentialFactory(realm), + "digest": digest.DigestCredentialFactory("md5", realm), + } for scheme in config.AuthSchemes: scheme = scheme.lower() @@ -206,7 +207,8 @@ root, portal, credentialFactories, - (auth.IPrincipal,)) + (auth.IPrincipal,) + ) site = Site(LogWrapperResource(authWrapper)) @@ -222,17 +224,16 @@ if not config.SSLOnly: httpService = internet.TCPServer(int(config.Port), channel) + httpService.setServiceParent(service) - httpService.setServiceParent(service) - if config.SSLEnable: from twisted.internet.ssl import DefaultOpenSSLContextFactory httpsService = internet.SSLServer( int(config.SSLPort), channel, DefaultOpenSSLContextFactory(config.SSLPrivateKey, - config.SSLCertificate)) - + config.SSLCertificate) + ) httpsService.setServiceParent(service) return service

1 0

[864] CalendarServer/trunk
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 864 http://trac.macosforge.org/projects/calendarserver/changeset/864 Author: wsanchez(a)apple.com Date: 2006-12-19 18:26:46 -0800 (Tue, 19 Dec 2006) Log Message: ----------- Use logs dir for ./run. Modified Paths: -------------- CalendarServer/trunk/conf/caldavd-test.plist CalendarServer/trunk/run Property Changed: ---------------- CalendarServer/trunk/ Property changes on: CalendarServer/trunk ___________________________________________________________________ Name: svn:ignore - *.tgz server.log* error.log* caldavd.pid + *.tgz logs build Modified: CalendarServer/trunk/conf/caldavd-test.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-test.plist 2006-12-20 01:04:20 UTC (rev 863) +++ CalendarServer/trunk/conf/caldavd-test.plist 2006-12-20 02:26:46 UTC (rev 864) @@ -48,16 +48,16 @@ <string>conf/server.pem</string> <key>ServerLogFile</key> - <string>server.log</string> + <string>logs/server.log</string> <key>ErrorLogFile</key> <string>-</string> <key>ServerStatsFile</key> - <string>stats.plist</string> + <string>logs/stats.plist</string> <key>PIDFile</key> - <string>caldavd.pid</string> + <string>logs/caldavd.pid</string>  <key>DirectoryService</key> Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2006-12-20 01:04:20 UTC (rev 863) +++ CalendarServer/trunk/run 2006-12-20 02:26:46 UTC (rev 864) @@ -172,13 +172,16 @@ if ! "${setup_only}"; then if [ ! -f "${config}" ]; then - echo "Missing config file: ${config}"; - echo "You might want to start by copying the test configuration:"; - echo " cp conf/caldavd-test.plist conf/caldavd-dev.plist"; - exit 1; + echo "Missing config file: ${config}"; + echo "You might want to start by copying the test configuration:"; + echo " cp conf/caldavd-test.plist conf/caldavd-dev.plist"; + exit 1; fi; cd "${wd}"; + if [ ! -d "${wd}/logs" ]; then + mkdir "${wd}/logs"; + fi; exec /bin/sh "${caldav}/bin/caldavd" ${daemonize} \ -f "${config}" \ -T "${twisted}/bin/twistd" \

1 0

[863] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 863 http://trac.macosforge.org/projects/calendarserver/changeset/863 Author: dreid(a)apple.com Date: 2006-12-19 17:04:20 -0800 (Tue, 19 Dec 2006) Log Message: ----------- Fix inner call to options for possible boolean values Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-20 00:51:00 UTC (rev 862) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-20 01:04:20 UTC (rev 863) @@ -89,7 +89,7 @@ self.overrides[key] = value else: - self.opt_options('%s=True' % (option,)) + self.opt_option('%s=True' % (option,)) opt_o = opt_option

1 0

[862] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 20 Dec '06

20 Dec '06

Revision: 862 http://trac.macosforge.org/projects/calendarserver/changeset/862 Author: dreid(a)apple.com Date: 2006-12-19 16:51:00 -0800 (Tue, 19 Dec 2006) Log Message: ----------- add -o and --option for overriding configuration options on the command line Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-20 00:40:41 UTC (rev 861) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-20 00:51:00 UTC (rev 862) @@ -42,7 +42,7 @@ from twisted.web2.log import LogWrapperResource from twisted.web2.server import Site -from twistedcaldav.config import config, parseConfig +from twistedcaldav.config import config, parseConfig, defaultConfig from twistedcaldav.logging import RotatingFileAccessLoggingObserver from twistedcaldav.root import RootResource from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource @@ -52,17 +52,55 @@ class CaldavOptions(Options): optParameters = [ ["config", "f", "/etc/caldavd/caldavd.plist", - "Path to configuration file."] + "Path to configuration file."], ] zsh_actions = {"config" : "_files -g '*.plist'"} + def __init__(self, *args, **kwargs): + super(CaldavOptions, self).__init__(*args, **kwargs) + + self.overrides = {} + + def opt_option(self, option): + """ + Set an option to override a value in the config file. True, False, int, + and float options are supported, as well as comma seperated lists. Only + one option may be given for each --option flag, however multiple + --option flags may be specified. + """ + + if '=' in option: + key, value = option.split('=') + + if key in defaultConfig: + if isinstance(defaultConfig[key], bool): + value = value == "True" + + elif isinstance(defaultConfig[key], (int, float, long)): + value = type(defaultConfig[key])(value) + + elif isinstance(defaultConfig[key], (list, tuples)): + value = value.split(',') + + elif isinstance(defaultConfig[key], dict): + raise usage.UsageError( + "We do not support dict options on the command line") + + self.overrides[key] = value + else: + self.opt_options('%s=True' % (option,)) + + opt_o = opt_option + def postOptions(self): if not os.path.exists(self['config']): print "Config file %s not found, using defaults" % (self['config'],) parseConfig(self['config']) + config.update(self.overrides) + self.parent['logfile'] = config.ErrorLogFile self.parent['pidfile'] = config.PIDFile

1 0