Revision

3566

Author

sagen@apple.com

Date

2008-12-22 12:22:10 -0800 (Mon, 22 Dec 2008)

Log Message

By default, bind caldav_notifier to local interface

Modified Paths

• CalendarServer/trunk/twistedcaldav/config.py
• CalendarServer/trunk/twistedcaldav/notify.py

Diff

--- CalendarServer/trunk/twistedcaldav/config.py	2008-12-22 20:09:11 UTC (rev 3565)
+++ CalendarServer/trunk/twistedcaldav/config.py	2008-12-22 20:22:10 UTC (rev 3566)
@@ -295,6 +295,7 @@
         "CoalesceSeconds" : 10,
         "InternalNotificationHost" : "localhost",
         "InternalNotificationPort" : 62309,
+        "BindAddress" : "127.0.0.1",
 
         "Services" : {
             "SimpleLineNotifier" : {

--- CalendarServer/trunk/twistedcaldav/notify.py	2008-12-22 20:09:11 UTC (rev 3565)
+++ CalendarServer/trunk/twistedcaldav/notify.py	2008-12-22 20:22:10 UTC (rev 3566)
@@ -32,7 +32,6 @@
 These notifications originate from cache.py:MemcacheChangeNotifier.changed().
 """
 
-# TODO: bindAddress to local
 # TODO: add CalDAVTester test for examining new xmpp-uri property
 
 from twisted.internet.protocol import ReconnectingClientFactory, ServerFactory
@@ -1301,7 +1300,8 @@
         internet.TCPServer(
             config.Notifications.InternalNotificationPort,
             InternalNotificationFactory(notifiers,
-                delaySeconds=config.Notifications.CoalesceSeconds)
+                delaySeconds=config.Notifications.CoalesceSeconds),
+            interface=config.Notifications.BindAddress
         ).setServiceParent(multiService)
 
         return multiService