Diff
Modified: CalendarServer/trunk/twistedcaldav/config.py (791 => 792)
--- CalendarServer/trunk/twistedcaldav/config.py 2006-12-11 20:42:10 UTC (rev 791)
+++ CalendarServer/trunk/twistedcaldav/config.py 2006-12-11 21:54:00 UTC (rev 792)
@@ -30,12 +30,9 @@
},
'DocumentRoot': '/Library/CalendarServer/Documents',
'DropBoxEnabled': True,
- 'DropBoxInheritedACLs': True,
- 'DropBoxName': 'dropbox',
'ErrorLogFile': '/var/log/caldavd/error.log',
'ManholePort': 0,
'MaximumAttachmentSizeBytes': 1048576,
- 'NotificationCollectionName': 'notifications',
'NotificationsEnabled': False,
'PIDFile': '/var/run/caldavd.pid',
'Port': 8008,
Modified: CalendarServer/trunk/twistedcaldav/dropbox.py (791 => 792)
--- CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-11 20:42:10 UTC (rev 791)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-11 21:54:00 UTC (rev 792)
@@ -41,20 +41,15 @@
notificationName = "notifications" # Name of the collection in which notifications will be stored.
@classmethod
- def enable(clzz, enabled, inheritedACLs=None, notifications=None):
+ def enable(clzz, enabled, notifications=None):
"""
This method must be used to enable drop box support as it will setup live properties etc,
and turn on the notification system. It must only be called once
@param enable: C{True} if drop box feature is enabled, C{False} otherwise
- @param dropboxName: C{str} containing the name of the drop box home collection
- @param inheritedACLs: C{True} if ACLs on drop boxes should be inherited by their contents, C{False} otehrwise.
@param notifications: C{True} if automatic notifications are to be sent when a drop box changes, C{False} otherwise.
- @param notificationName: C{str} containing the name of the collection used to store per-user notifications.
"""
DropBox.enabled = enabled
- if inheritedACLs:
- DropBox.inheritedACLs = inheritedACLs
if notifications:
DropBox.notifications = notifications
Modified: CalendarServer/trunk/twistedcaldav/tap.py (791 => 792)
--- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-11 20:42:10 UTC (rev 791)
+++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-11 21:54:00 UTC (rev 792)
@@ -41,6 +41,7 @@
from twisted.web2.server import Site
from twistedcaldav.config import config, parseConfig
+from twistedcaldav.dropbox import DropBox
from twistedcaldav.logging import RotatingFileAccessLoggingObserver
from twistedcaldav.root import RootResource
from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
@@ -83,6 +84,11 @@
def makeService(self, options):
#
+ # Turn on drop box support before setting up the repository
+ #
+ DropBox.enable(config.DropBoxEnabled, config.NotificationsEnabled)
+
+ #
# Setup the Directory
#