[CalendarServer-changes] [3964] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3964
          http://trac.macosforge.org/projects/calendarserver/changeset/3964
Author:   wsanchez at apple.com
Date:     2009-04-09 16:59:01 -0700 (Thu, 09 Apr 2009)
Log Message:
-----------
Revert 3939 and 3942

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/accesslog.py
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/mail.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-04-09 23:59:01 UTC (rev 3964)
@@ -1010,7 +1010,7 @@
 
         if (
             config.Notifications.Enabled and
-            config.Notifications.InternalNotificationHost == "127.0.0.1"
+            config.Notifications.InternalNotificationHost == "localhost"
         ):
             self.log_info("Adding notification service")
 
@@ -1026,7 +1026,7 @@
 
         if (
             config.Scheduling.iMIP.Enabled and
-            config.Scheduling.iMIP.MailGatewayServer == "127.0.0.1"
+            config.Scheduling.iMIP.MailGatewayServer == "localhost"
         ):
             self.log_info("Adding mail gateway service")
 

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2009-04-09 23:59:01 UTC (rev 3964)
@@ -379,7 +379,7 @@
         <key>Enabled</key>
         <false/>
         <key>MailGatewayServer</key>
-        <string>127.0.0.1</string>
+        <string>localhost</string>
         <key>MailGatewayPort</key>
         <integer>62310</integer>
         <key>Sending</key>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2009-04-09 23:59:01 UTC (rev 3964)
@@ -419,7 +419,7 @@
       <integer>3</integer>
 
       <key>InternalNotificationHost</key>
-      <string>127.0.0.1</string>
+      <string>localhost</string>
 
       <key>InternalNotificationPort</key>
       <integer>62309</integer>
@@ -532,7 +532,7 @@
         <key>Enabled</key>
         <false/>
         <key>MailGatewayServer</key>
-        <string>127.0.0.1</string>
+        <string>localhost</string>
         <key>MailGatewayPort</key>
         <integer>62310</integer>
         <key>Sending</key>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/conf/caldavd.plist	2009-04-09 23:59:01 UTC (rev 3964)
@@ -376,7 +376,7 @@
         <key>Enabled</key>
         <false/>
         <key>MailGatewayServer</key>
-        <string>127.0.0.1</string>
+        <string>localhost</string>
         <key>MailGatewayPort</key>
         <integer>62310</integer>
         <key>Sending</key>

Modified: CalendarServer/trunk/twistedcaldav/accesslog.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/accesslog.py	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/twistedcaldav/accesslog.py	2009-04-09 23:59:01 UTC (rev 3964)
@@ -283,7 +283,7 @@
         if self.mode == "AF_UNIX":
             d = self.client.connectUNIX(self.id)
         else:
-            d = self.client.connectTCP("127.0.0.1", self.id)
+            d = self.client.connectTCP("localhost", self.id)
         d.addCallback(_gotProtocol)
 
     def stop(self):

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/twistedcaldav/config.py	2009-04-09 23:59:01 UTC (rev 3964)
@@ -258,7 +258,7 @@
 
         "iMIP": {
             "Enabled"          : False, # Server-to-iMIP protocol
-            "MailGatewayServer" : "127.0.0.1",
+            "MailGatewayServer" : "localhost",
             "MailGatewayPort"   : 62310,
             "Username"          : "com.apple.calendarserver", # For account injecting replies
             "Password"          : "",    # For account injecting replies
@@ -304,7 +304,7 @@
     "Notifications" : {
         "Enabled": False,
         "CoalesceSeconds" : 3,
-        "InternalNotificationHost" : "127.0.0.1",
+        "InternalNotificationHost" : "localhost",
         "InternalNotificationPort" : 62309,
         "BindAddress" : "127.0.0.1",
 

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2009-04-09 13:42:02 UTC (rev 3963)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2009-04-09 23:59:01 UTC (rev 3964)
@@ -543,8 +543,8 @@
         port = config.HTTPPort
 
     # If we're running on same host as calendar server, inject via localhost
-    if config.Scheduling['iMIP']['MailGatewayServer'] == '127.0.0.1':
-        host = '127.0.0.1'
+    if config.Scheduling['iMIP']['MailGatewayServer'] == 'localhost':
+        host = 'localhost'
     else:
         host = config.ServerHostName
     path = "inbox"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090409/593de011/attachment.html>