[CalendarServer-changes] [1240] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1240
          http://trac.macosforge.org/projects/calendarserver/changeset/1240
Author:   wsanchez at apple.com
Date:     2007-02-22 17:54:32 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
config.BindAddress -> config.BindAddresses

Modified Paths:
--------------
    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/tap.py

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 01:51:46 UTC (rev 1239)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 01:54:32 UTC (rev 1240)
@@ -29,7 +29,7 @@
   <key>DocumentRoot</key>
   <string>twistedcaldav/test/data/</string>
 
-  <key>BindAddress</key>
+  <key>BindAddresses</key>
   <array>
     <string>127.0.0.1</string>
   </array>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 01:51:46 UTC (rev 1239)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 01:54:32 UTC (rev 1240)
@@ -29,7 +29,7 @@
   <key>DocumentRoot</key>
   <string>twistedcaldav/test/data/</string>
 
-  <key>BindAddress</key>
+  <key>BindAddresses</key>
   <array>
     <string>127.0.0.1</string>
   </array>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-23 01:51:46 UTC (rev 1239)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-23 01:54:32 UTC (rev 1240)
@@ -29,7 +29,7 @@
   <key>DocumentRoot</key>
   <string>/Library/CalendarServer/Documents</string>
 
-  <key>BindAddress</key>
+  <key>BindAddresses</key>
   <array>
   </array>
 

Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py	2007-02-23 01:51:46 UTC (rev 1239)
+++ CalendarServer/trunk/twistedcaldav/cluster.py	2007-02-23 01:54:32 UTC (rev 1240)
@@ -73,7 +73,7 @@
             '-n', 'caldav',
             '-f', self.configFile,
             '-o', 'ServerType=slave',
-            '-o', 'BindAddress=%s' % (','.join(self.interfaces),),
+            '-o', 'BindAddresses=%s' % (','.join(self.interfaces),),
             '-o', 'InstancePort=%s' % (self.port,),
             '-o', 'InstanceSSLPort=%s' % (self.sslPort,),
             '-o', 'PIDFile=None',
@@ -105,7 +105,7 @@
     bindAddress = ['127.0.0.1']
 
     if not config.MultiProcess['LoadBalancer']['Enabled']:
-        bindAddress = config.BindAddress
+        bindAddress = config.BindAddresses
 
     for p in xrange(0, config.MultiProcess['NumProcesses']):
         if int(config.MultiProcess['NumProcesses']) > 1:
@@ -131,10 +131,10 @@
         config.MultiProcess['NumProcesses'] > 1):
         services = []
 
-        if not config.BindAddress:
-            config.BindAddress = ['']
+        if not config.BindAddresses:
+            config.BindAddresses = ['']
 
-        for bindAddress in config.BindAddress:
+        for bindAddress in config.BindAddresses:
             if not config.SSLOnly:
                 services.append(serviceTemplate % {
                         'name': 'http',

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 01:51:46 UTC (rev 1239)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 01:54:32 UTC (rev 1240)
@@ -40,7 +40,7 @@
     #
     #    This configures the actual network address that the server binds to.
     #
-    "BindAddress": [],     # List of IP addresses to bind to [empty = all]
+    "BindAddresses": [],   # List of IP addresses to bind to [empty = all]
     "InstancePort": 0,     # Port number to bind to for HTTP [0 = same as "Port"]
     "InstanceSSLPort": 0,  # Port number to bind to for SSL [0 = same as "SSLPort"]
     "ManholePort": 0,      # Port number to bind to for Twisted manhole (debugging) [0 = none]

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2007-02-23 01:51:46 UTC (rev 1239)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2007-02-23 01:54:32 UTC (rev 1240)
@@ -426,10 +426,10 @@
         
         service = CalDAVService(logObserver)
 
-        if not config.BindAddress:
-            config.BindAddress = ['']
+        if not config.BindAddresses:
+            config.BindAddresses = ['']
 
-        for bindAddress in config.BindAddress:
+        for bindAddress in config.BindAddresses:
             if not config.SSLOnly:
                 if config.InstancePort == 0:
                     config.InstancePort = config.HTTPPort

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070222/dc1cb96b/attachment.html