[CalendarServer-changes] [1218] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Feb 20 10:23:30 PST 2007
Revision: 1218
http://trac.macosforge.org/projects/calendarserver/changeset/1218
Author: cdaboo at apple.com
Date: 2007-02-20 10:23:30 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
This is a better way to handle the base service port issue. We keep the existing Port/SSLPort config options as-is, but
now pass in InstancePort and InstanceSSLPort into the "slave" caldavd processes and those will override the "base" values.
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-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-20 18:23:30 UTC (rev 1218)
@@ -40,15 +40,9 @@
<key>Port</key>
<integer>8008</integer>
- <key>BasePort</key>
- <integer>8008</integer>
-
<key>SSLPort</key>
<integer>8443</integer>
- <key>BaseSSLPort</key>
- <integer>8443</integer>
-
<key>SSLEnable</key>
<true/>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2007-02-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2007-02-20 18:23:30 UTC (rev 1218)
@@ -40,15 +40,9 @@
<key>Port</key>
<integer>8008</integer>
- <key>BasePort</key>
- <integer>8008</integer>
-
<key>SSLPort</key>
<integer>8443</integer>
- <key>BaseSSLPort</key>
- <integer>8443</integer>
-
<key>SSLEnable</key>
<true/>
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2007-02-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/conf/caldavd.plist 2007-02-20 18:23:30 UTC (rev 1218)
@@ -45,15 +45,9 @@
<key>Port</key>
<integer>8008</integer>
- <key>BasePort</key>
- <integer>8008</integer>
-
<key>SSLPort</key>
<integer>8443</integer>
- <key>BaseSSLPort</key>
- <integer>8443</integer>
-
<key>SSLEnable</key>
<true/>
Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-20 18:23:30 UTC (rev 1218)
@@ -20,6 +20,8 @@
import sys
import tempfile
+from twisted.python import log
+
from twisted.runner import procmon
from twisted.scripts.mktap import getid
from twistedcaldav.config import config
@@ -72,8 +74,8 @@
'-f', self.configFile,
'-o', 'ServerType=slave',
'-o', 'BindAddress=%s' % (','.join(self.interfaces),),
- '-o', 'Port=%s' % (self.port,),
- '-o', 'SSLPort=%s' % (self.sslPort,),
+ '-o', 'InstancePort=%s' % (self.port,),
+ '-o', 'InstanceSSLPort=%s' % (self.sslPort,),
'-o', 'PIDFile=None',
'-o', 'ErrorLogFile=None']
@@ -161,6 +163,8 @@
os.write(fd, pdconfig)
os.close(fd)
+ log.msg("Adding pydirector service with configuration: %s" % (fname,))
+
service.addProcess('pydir', [sys.executable,
config.pydirLocation,
fname])
@@ -170,6 +174,8 @@
def makeService_pydir(self, options):
service = procmon.ProcessMonitor()
+ log.msg("Adding pydirector service with configuration: %s" % (config.pydirConfig,))
+
service.addProcess('pydir', [sys.executable,
config.pydirLocation,
config.pydirConfig])
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2007-02-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/twistedcaldav/config.py 2007-02-20 18:23:30 UTC (rev 1218)
@@ -23,8 +23,6 @@
defaultConfigFile = '/etc/caldavd/caldavd.plist'
defaultConfig = {
- 'BasePort': 8008,
- 'BaseSSLPort': 8443,
'BindAddress': [],
'CalendarUserProxyEnabled': True,
'DirectoryService': {
@@ -34,6 +32,8 @@
'DocumentRoot': '/Library/CalendarServer/Documents',
'DropBoxEnabled': False,
'ErrorLogFile': '/var/log/caldavd/error.log',
+ 'InstancePort': 0,
+ 'InstanceSSLPort': 0,
'ManholePort': 0,
'MaximumAttachmentSizeBytes': 1048576,
'NotificationsEnabled': False,
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-02-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-02-20 18:23:30 UTC (rev 1218)
@@ -444,9 +444,9 @@
addresses = set(self.record.calendarUserAddresses)
addresses.add(self.principalURL())
if not config.SSLOnly:
- addresses.add("http://%s:%s%s" % (config.ServerHostName, config.BasePort, self.principalURL(),))
+ addresses.add("http://%s:%s%s" % (config.ServerHostName, config.Port, self.principalURL(),))
if config.SSLEnable:
- addresses.add("https://%s:%s%s" % (config.ServerHostName, config.BaseSSLPort, self.principalURL(),))
+ addresses.add("https://%s:%s%s" % (config.ServerHostName, config.SSLPort, self.principalURL(),))
addresses.add("urn:uuid:%s" % (self.principalUID(),))
return addresses
Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py 2007-02-20 17:48:14 UTC (rev 1217)
+++ CalendarServer/trunk/twistedcaldav/tap.py 2007-02-20 18:23:30 UTC (rev 1218)
@@ -431,20 +431,24 @@
for bindAddress in config.BindAddress:
if not config.SSLOnly:
+ if config.InstancePort == 0:
+ config.InstancePort = config.Port
log.msg("Adding server at %s:%s" % (
- bindAddress, config.Port))
+ bindAddress, config.InstancePort))
- httpService = internet.TCPServer(int(config.Port), channel,
+ httpService = internet.TCPServer(int(config.InstancePort), channel,
interface=bindAddress)
httpService.setServiceParent(service)
if config.SSLEnable:
from twisted.internet.ssl import DefaultOpenSSLContextFactory
+ if config.InstanceSSLPort == 0:
+ config.InstanceSSLPort = config.SSLPort
log.msg("Adding SSL server at %s:%s" % (
- bindAddress, config.SSLPort))
+ bindAddress, config.InstanceSSLPort))
httpsService = internet.SSLServer(
- int(config.SSLPort),
+ int(config.InstanceSSLPort),
channel,
DefaultOpenSSLContextFactory(config.SSLPrivateKey,
config.SSLCertificate),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070220/956ada65/attachment.html
More information about the calendarserver-changes
mailing list