[CalendarServer-changes] [1239] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 22 17:51:47 PST 2007
Revision: 1239
http://trac.macosforge.org/projects/calendarserver/changeset/1239
Author: wsanchez at apple.com
Date: 2007-02-22 17:51:46 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
Port -> HTTPPort
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/directory/principal.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:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-23 01:51:46 UTC (rev 1239)
@@ -37,7 +37,7 @@
<key>ServerHostName</key>
<string>localhost</string>
- <key>Port</key>
+ <key>HTTPPort</key>
<integer>8008</integer>
<key>SSLPort</key>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 01:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 01:51:46 UTC (rev 1239)
@@ -37,7 +37,7 @@
<key>ServerHostName</key>
<string>localhost</string>
- <key>Port</key>
+ <key>HTTPPort</key>
<integer>8008</integer>
<key>SSLPort</key>
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2007-02-23 01:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/conf/caldavd.plist 2007-02-23 01:51:46 UTC (rev 1239)
@@ -42,7 +42,7 @@
<key>Groupname</key>
<string>calendar</string>
- <key>Port</key>
+ <key>HTTPPort</key>
<integer>8008</integer>
<key>SSLPort</key>
Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-23 01:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-23 01:51:46 UTC (rev 1239)
@@ -99,7 +99,7 @@
hosts = []
sslHosts = []
- port = config.Port
+ port = config.HTTPPort
sslport = config.SSLPort
bindAddress = ['127.0.0.1']
@@ -139,7 +139,7 @@
services.append(serviceTemplate % {
'name': 'http',
'bindAddress': bindAddress,
- 'port': config.Port,
+ 'port': config.HTTPPort,
'scheduler':
config.MultiProcess['LoadBalancer']['Scheduler'],
'hosts': '\n'.join(hosts)
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 01:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 01:51:46 UTC (rev 1239)
@@ -32,7 +32,7 @@
# load balancer or proxy which forwards connections to the server.
#
"ServerHostName": "localhost", # Network host name.
- "Port": 8008, # HTTP port
+ "HTTPPort": 8008, # HTTP port
"SSLPort": 8443, # SSL port
#
@@ -77,17 +77,17 @@
# Authentication
#
"Authentication": {
- "Basic" : { "Enabled": False } # Clear text; best avoided
- "Digest" : { "Enabled": True, "Algorithm": "md5" } # Digest challenge/response
- "Kerberos": { "Enabled": False, "Realm": "" } # Kerberos/SPNEGO
+ "Basic" : { "Enabled": False }, # Clear text; best avoided
+ "Digest" : { "Enabled": True, "Algorithm": "md5" }, # Digest challenge/response
+ "Kerberos": { "Enabled": False, "Realm": "" }, # Kerberos/SPNEGO
},
#
# Logging
#
"Verbose": False,
- "ServerLogFile": "/var/log/caldavd/access.log",
- "ErrorLogFile": "/var/log/caldavd/error.log",
+ "ServerLogFile": "/var/log/caldavd/access.log", # Apache-styp access log
+ "ErrorLogFile": "/var/log/caldavd/error.log", # Server activity log
"ServerStatsFile": "/Library/CalendarServer/Documents/stats.plist",
"PIDFile": "/var/run/caldavd.pid",
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-02-23 01:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-02-23 01:51:46 UTC (rev 1239)
@@ -126,7 +126,7 @@
return None
if port != {
- "http" : config.Port,
+ "http" : config.HTTPPort,
"https": config.SSLPort,
}[scheme]:
return None
@@ -445,7 +445,7 @@
addresses = set(self.record.calendarUserAddresses)
addresses.add(self.principalURL())
if not config.SSLOnly:
- addresses.add("http://%s:%s%s" % (config.ServerHostName, config.Port, self.principalURL(),))
+ addresses.add("http://%s:%s%s" % (config.ServerHostName, config.HTTPPort, self.principalURL(),))
if config.SSLEnable:
addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, self.principalURL(),))
addresses.add("urn:uuid:%s" % (self.principalUID(),))
Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py 2007-02-23 01:30:51 UTC (rev 1238)
+++ CalendarServer/trunk/twistedcaldav/tap.py 2007-02-23 01:51:46 UTC (rev 1239)
@@ -432,7 +432,7 @@
for bindAddress in config.BindAddress:
if not config.SSLOnly:
if config.InstancePort == 0:
- config.InstancePort = config.Port
+ config.InstancePort = config.HTTPPort
log.msg("Adding server at %s:%s" % (
bindAddress, config.InstancePort))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070222/f27f4403/attachment.html
More information about the calendarserver-changes
mailing list