[CalendarServer-changes] [13813] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 31 18:26:51 PDT 2014
Revision: 13813
http://trac.calendarserver.org//changeset/13813
Author: sagen at apple.com
Date: 2014-07-31 18:26:51 -0700 (Thu, 31 Jul 2014)
Log Message:
-----------
Enable the directory proxy sidecar by default
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tap/caldav.py
CalendarServer/trunk/twistedcaldav/stdconfig.py
Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py 2014-08-01 00:25:27 UTC (rev 13812)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2014-08-01 01:26:51 UTC (rev 13813)
@@ -128,8 +128,6 @@
pgServiceFromConfig, getDBPool, MemoryLimitService,
storeFromConfig
)
-from twisted.application.strports import service as strPortsService
-from txdav.dps.server import DirectoryProxyAMPFactory
try:
from calendarserver.version import version
except ImportError:
@@ -1894,28 +1892,14 @@
store.callWithNewTransactions(decorateTransaction)
- # Set up AMP for DPS Server in the master instead of sidecar
- if not config.DirectoryProxy.Enabled:
- strPortsService(
- "unix:{path}:mode=660".format(
- path=config.DirectoryProxy.SocketPath
- ),
- DirectoryProxyAMPFactory(store.directoryService())
- ).setServiceParent(multi)
-
return multi
- if config.DirectoryProxy.Enabled:
- # If the master is to act as a DPS client, and talk to the
- # DPS sidecar:
- directory = DirectoryProxyClientService(
- config.DirectoryRealmName
- )
- if config.Servers.Enabled:
- directory.setServersDB(buildServersDB(config.Servers.MaxClients))
- else:
- # If the master is to act as the DPS server:
- directory = None
+ # The master will use its own directory. We could switch this
+ # service out for a DirectoryProxyClientService once the DPS
+ # sidecar is running, but not sure that's necessary as the master
+ # is likely not doing much directory-related activity once it
+ # spawns the caldavd workers.
+ directory = None
ssvc = self.storageService(
spawnerSvcCreator, None, uid, gid, directory=directory
Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-08-01 00:25:27 UTC (rev 13812)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-08-01 01:26:51 UTC (rev 13813)
@@ -898,11 +898,8 @@
},
"DirectoryProxy": {
- "Enabled": False,
+ "Enabled": True,
"SocketPath": "directory-proxy.sock",
- "DirectoryType": "XML", # "LDAP", "OD", "XML"
- "Arguments": [],
- "Keywords": {},
},
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140731/06668c09/attachment.html>
More information about the calendarserver-changes
mailing list