[CalendarServer-changes] [1248] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 22 20:43:59 PST 2007
Revision: 1248
http://trac.macosforge.org/projects/calendarserver/changeset/1248
Author: wsanchez at apple.com
Date: 2007-02-22 20:43:58 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
FooEnable(d) -> EnableFoo
Username -> UserName
Groupname -> GroupName
Modified Paths:
--------------
CalendarServer/trunk/bin/caldavd
CalendarServer/trunk/conf/caldavd-test-logged.plist
CalendarServer/trunk/conf/caldavd-test.plist
CalendarServer/trunk/conf/caldavd.plist
CalendarServer/trunk/twistedcaldav/cluster.py
CalendarServer/trunk/twistedcaldav/config.py
CalendarServer/trunk/twistedcaldav/directory/calendar.py
CalendarServer/trunk/twistedcaldav/directory/principal.py
CalendarServer/trunk/twistedcaldav/dropbox.py
CalendarServer/trunk/twistedcaldav/root.py
CalendarServer/trunk/twistedcaldav/schedule.py
CalendarServer/trunk/twistedcaldav/static.py
CalendarServer/trunk/twistedcaldav/tap.py
Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/bin/caldavd 2007-02-23 04:43:58 UTC (rev 1248)
@@ -83,8 +83,8 @@
echo "Options:";
echo " -h Print this help and exit";
echo " -X Do not daemonize";
- echo " -u Username to run as";
- echo " -g Group to run as";
+ echo " -u User name to run as";
+ echo " -g Group name to run as";
echo " -f Configuration file to read";
echo " -T Path to twistd binary";
echo " -t Service type (master, slave, standalone, cluster)";
Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-23 04:43:58 UTC (rev 1248)
@@ -148,19 +148,19 @@
<key>UserQuota</key>
<integer>104857600</integer><!-- 100Mb -->
- <key>DropBoxEnabled</key>
+ <key>EnableDropBox</key>
<true/>
- <key>NotificationsEnabled</key>
+ <key>EnableNotifications</key>
<true/>
- <key>CalendarUserProxyEnabled</key>
+ <key>EnableProxyPrincipals</key>
<true/>
<key>twistdLocation</key>
<string>../Twisted/bin/twistd</string>
- <key>SACLEnable</key>
+ <key>EnableSACLs</key>
<false/>
<key>Authentication</key>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 04:43:58 UTC (rev 1248)
@@ -154,19 +154,19 @@
<key>UserQuota</key>
<integer>104857600</integer><!-- 100Mb -->
- <key>DropBoxEnabled</key>
+ <key>EnableDropBox</key>
<true/>
- <key>NotificationsEnabled</key>
+ <key>EnableNotifications</key>
<true/>
- <key>CalendarUserProxyEnabled</key>
+ <key>EnableProxyPrincipals</key>
<true/>
<key>twistdLocation</key>
<string>../Twisted/bin/twistd</string>
- <key>SACLEnable</key>
+ <key>EnableSACLs</key>
<false/>
<key>Authentication</key>
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/conf/caldavd.plist 2007-02-23 04:43:58 UTC (rev 1248)
@@ -102,16 +102,16 @@
<key>UserQuota</key>
<integer>104857600</integer><!-- 100Mb -->
- <key>DropBoxEnabled</key>
+ <key>EnableDropBox</key>
<true/>
- <key>NotificationsEnabled</key>
+ <key>EnableNotifications</key>
<true/>
- <key>CalendarUserProxyEnabled</key>
+ <key>EnableProxyPrincipals</key>
<true/>
- <key>SACLEnable</key>
+ <key>EnableSACLs</key>
<true/>
<key>Authentication</key>
Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -68,8 +68,8 @@
return [
sys.executable,
self.twistd,
- '-u', config.Username,
- '-g', config.Groupname,
+ '-u', config.UserName,
+ '-g', config.GroupName,
'-n', 'caldav',
'-f', self.configFile,
'-o', 'ServerType=slave',
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -70,7 +70,7 @@
#
"AdminPrincipals": [], # Principals with "DAV:all" access (relative URLs)
"SudoersFile": "/etc/caldavd/sudoers.plist", # Principals that can pose as other principals
- "CalendarUserProxyEnabled": True, # Create "proxy access" principals
+ "EnableProxyPrincipals": True, # Create "proxy access" principals
#
# Authentication
@@ -99,8 +99,8 @@
#
# Process management
#
- "Username": "daemon",
- "Groupname": "daemon",
+ "UserName": "daemon",
+ "GroupName": "daemon",
"ServerType": "singleprocess",
"MultiProcess": {
"NumProcesses": 10,
@@ -113,13 +113,13 @@
#
# Service ACLs
#
- "SACLEnable": False,
+ "EnableSACLs": False,
#
# Non-standard CalDAV extensions
#
- "DropBoxEnabled": False, # Calendar Drop Box
- "NotificationsEnabled": False, # Drop Box Notifications
+ "EnableDropBox" : False, # Calendar Drop Box
+ "EnableNotifications": False, # Drop Box Notifications
#
# Implementation details
Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -195,11 +195,11 @@
("inbox" , ScheduleInboxResource ),
("outbox", ScheduleOutboxResource),
)
- if config.DropBoxEnabled:
+ if config.EnableDropBox:
childlist += (
("dropbox" , DropBoxHomeResource ),
)
- if config.NotificationsEnabled:
+ if config.EnableNotifications:
childlist += (
("notifications", NotificationsCollectionResource),
)
@@ -280,7 +280,7 @@
),
)
- if config.CalendarUserProxyEnabled:
+ if config.EnableProxyPrincipals:
aces += (
# DAV:read access for this principal's calendar-proxy-read users.
davxml.ACE(
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -423,7 +423,7 @@
def groupMemberships(self):
groups = self._getRelatives("groups")
- if config.CalendarUserProxyEnabled:
+ if config.EnableProxyPrincipals:
# Get proxy group GUIDs and map to principal resources
proxies = self._map_calendar_user_proxy_guids(self._calendar_user_proxy_index().getMemberships(self.principalUID()))
groups.update(proxies)
@@ -510,13 +510,13 @@
if name == "":
return self
- if config.CalendarUserProxyEnabled and name in ("calendar-proxy-read", "calendar-proxy-write"):
+ if config.EnableProxyPrincipals 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:
+ if config.EnableProxyPrincipals:
return ("calendar-proxy-read", "calendar-proxy-write")
else:
return ()
Modified: CalendarServer/trunk/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dropbox.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -132,7 +132,7 @@
# For drop box we look at the parent collection of the target resource and get the
# set of subscribed principals.
- if not config.NotificationsEnabled or not self.hasDeadProperty(customxml.Subscribed):
+ if not config.EnableNotifications or not self.hasDeadProperty(customxml.Subscribed):
yield None
return
Modified: CalendarServer/trunk/twistedcaldav/root.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/root.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/root.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -39,7 +39,7 @@
def __init__(self, path, *args, **kwargs):
super(RootResource, self).__init__(path, *args, **kwargs)
- if config.SACLEnable and RootResource.CheckSACL:
+ if config.EnableSACLs and RootResource.CheckSACL:
self.useSacls = True
def checkSacl(self, request):
Modified: CalendarServer/trunk/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/schedule.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/schedule.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -111,7 +111,7 @@
"""
def defaultAccessControlList(self):
- if config.CalendarUserProxyEnabled:
+ if config.EnableProxyPrincipals:
myPrincipal = self.parent.principalForRecord()
return davxml.ACL(
Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/static.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -464,11 +464,11 @@
DirectoryCalendarHomeResource.__init__(self, parent, record)
def provisionChild(self, name):
- if config.DropBoxEnabled:
+ if config.EnableDropBox:
DropBoxHomeFileClass = DropBoxHomeFile
else:
DropBoxHomeFileClass = None
- if config.NotificationsEnabled:
+ if config.EnableNotifications:
NotificationsCollectionFileClass = NotificationsCollectionFile
else:
NotificationsCollectionFileClass = None
Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py 2007-02-23 04:18:05 UTC (rev 1247)
+++ CalendarServer/trunk/twistedcaldav/tap.py 2007-02-23 04:43:58 UTC (rev 1248)
@@ -158,8 +158,8 @@
"Document root",
access=os.R_OK or os.W_OK,
permissions=0750,
- uname=config.Username,
- gname=config.Groupname)
+ uname=config.UserName,
+ gname=config.GroupName)
# Verify that ssl certs exist if needed
if config.SSLPort:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070222/d2bb2cc8/attachment.html
More information about the calendarserver-changes
mailing list