[CalendarServer-changes] [12911] CalendarServer/branches/users/sagen/move2who-3

[source_changes at macosforge.org]

Revision: 12911
          http://trac.calendarserver.org//changeset/12911
Author:   sagen at apple.com
Date:     2014-03-14 10:58:21 -0700 (Fri, 14 Mar 2014)
Log Message:
-----------
Use ServerHostName for realm name

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-3/calendarserver/tap/caldav.py
    CalendarServer/branches/users/sagen/move2who-3/twistedcaldav/stdconfig.py

Modified: CalendarServer/branches/users/sagen/move2who-3/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-3/calendarserver/tap/caldav.py	2014-03-14 16:16:29 UTC (rev 12910)
+++ CalendarServer/branches/users/sagen/move2who-3/calendarserver/tap/caldav.py	2014-03-14 17:58:21 UTC (rev 12911)
@@ -907,7 +907,7 @@
         CalDAV and CardDAV requests.
         """
         pool, txnFactory = getDBPool(config)
-        directory = DirectoryProxyClientService("FIXME")
+        directory = DirectoryProxyClientService(config.DirectoryRealmName)
         store = storeFromConfig(config, txnFactory, directory)
         logObserver = AMPCommonAccessLoggingObserver()
         result = self.requestProcessingService(options, store, logObserver)
@@ -1927,7 +1927,7 @@
 
         ssvc = self.storageService(
             spawnerSvcCreator, None, uid, gid,
-            directory=DirectoryProxyClientService("FIXME")
+            directory=DirectoryProxyClientService(config.DirectoryRealmName)
         )
         ssvc.setServiceParent(s)
         return s

Modified: CalendarServer/branches/users/sagen/move2who-3/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-3/twistedcaldav/stdconfig.py	2014-03-14 16:16:29 UTC (rev 12910)
+++ CalendarServer/branches/users/sagen/move2who-3/twistedcaldav/stdconfig.py	2014-03-14 17:58:21 UTC (rev 12911)
@@ -379,6 +379,8 @@
         "params": DEFAULT_SERVICE_PARAMS["twistedcaldav.directory.xmlfile.XMLDirectoryService"],
     },
 
+    "DirectoryRealmName": "",
+
     #
     # Locations and Resources service
     #
@@ -1253,8 +1255,12 @@
             hostname = "localhost"
         configDict.ServerHostName = hostname
 
+    # Default DirectoryRealmName from ServerHostName
+    if not configDict.DirectoryRealmName:
+        configDict.DirectoryRealmName = configDict.ServerHostName
 
 
+
 def _updateMultiProcess(configDict, reloading=False):
     """
     Dynamically compute ProcessCount if it's set to 0.  Always compute
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140314/cdfa176b/attachment.html>