[CalendarServer-changes] [1235] CalendarServer/trunk/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 1235
          http://trac.macosforge.org/projects/calendarserver/changeset/1235
Author:   wsanchez at apple.com
Date:     2007-02-22 16:49:22 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
cosmetic

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-02-22 21:49:08 UTC (rev 1234)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 00:49:22 UTC (rev 1235)
@@ -20,73 +20,95 @@
 
 from twistedcaldav.py.plistlib import readPlist
 
-defaultConfigFile = '/etc/caldavd/caldavd.plist'
+defaultConfigFile = "/etc/caldavd/caldavd.plist"
 
 defaultConfig = {
-    'BindAddress': [],
-    'CalendarUserProxyEnabled': True,
-    'DirectoryService': {
-        'params': {'node': '/Search', 'useFullSchema': True},
-        'type': 'twistedcaldav.directory.appleopendirectory.OpenDirectoryService'
+    # Public network address
+    "ServerHostName": "localhost",
+    "Port": 8008,
+    "SSLPort": 8443,
+
+    # Network configuration
+    "BindAddress": [],
+    "InstancePort": 0,
+    "InstanceSSLPort": 0,
+    "ManholePort": 0,
+
+    # Data store
+    "DocumentRoot": "/Library/CalendarServer/Documents",
+    "UserQuotaBytes": 104857600,
+    "MaximumAttachmentSizeBytes": 1048576,
+
+    # Directory service
+    "DirectoryService": {
+        "params": {
+            "node": "/Search",
+            "useFullSchema": True,
+        },
+        "type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService"
     },
-    'DocumentRoot': '/Library/CalendarServer/Documents',
-    'DropBoxEnabled': False,
-    'ErrorLogFile': '/var/log/caldavd/error.log',
-    'InstancePort': 0,
-    'InstanceSSLPort': 0,
-    'ManholePort': 0,
-    'MaximumAttachmentSizeBytes': 1048576,
-    'NotificationsEnabled': False,
-    'PIDFile': '/var/run/caldavd.pid',
-    'ServerHostName': 'localhost',
-    'Port': 8008,
-    'RunStandalone': True,
-    'SSLCertificate': '/etc/certificates/Default.crt',
-    'SSLEnable': True,
-    'SSLOnly': True,
-    'SSLPort': 8443,
-    'SSLPrivateKey': '/etc/certificates/Default.key',
-    'ServerLogFile': '/var/log/caldavd/server.log',
-    'ServerStatsFile': '/Library/CalendarServer/Documents/stats.plist',
-    'UserQuotaBytes': 104857600,
-    'Verbose': False,
-    'ServerHostName': 'localhost',
-    'SACLEnable': False,
-    'Authentication': {
-        'Basic': {
-            'Enabled': False,
-            },
-        'Digest': {
-            'Enabled': True,
-            'Algorithm': 'md5',
-            },
-        'Kerberos': {
-            'Enabled': False,
-            'Realm': '',
-            },
-        },
 
-    'AdminPrincipals': [],
-    'SudoersFile': '/etc/caldavd/sudoers.plist',
+    # Special principals
+    "AdminPrincipals": [],
+    "SudoersFile": "/etc/caldavd/sudoers.plist",
+    "CalendarUserProxyEnabled": True,
 
-    'twistdLocation': '/usr/share/caldavd/bin/twistd',
-    'pydirLocation': '/usr/share/caldavd/bin/pydir++.py',
-    'pydirConfig': '/etc/caldavd/pydir.xml',
+    # Authentication
+    "Authentication": {
+        "Basic": {
+            "Enabled": False,
+        },
+        "Digest": {
+            "Enabled": True,
+            "Algorithm": "md5",
+        },
+        "Kerberos": {
+            "Enabled": False,
+            "Realm": "",
+        },
+    },
 
-    'ServerType': 'singleprocess',
+    # Logging
+    "Verbose": False,
+    "ServerLogFile": "/var/log/caldavd/access.log",
+    "ErrorLogFile": "/var/log/caldavd/error.log",
+    "ServerStatsFile": "/Library/CalendarServer/Documents/stats.plist",
+    "PIDFile": "/var/run/caldavd.pid",
 
-    'Username': 'daemon',
-    'Groupname': 'daemon',
+    # SSL
+    "SSLOnly": True,
+    "SSLEnable": True,
+    "SSLCertificate": "/etc/certificates/Default.crt",
+    "SSLPrivateKey": "/etc/certificates/Default.key",
 
-    'MultiProcess': {
-        'NumProcesses': 10,
-        'LoadBalancer': {
-            'Enabled': True,
-            'Scheduler': 'leastconns',
-            },
+    # Process management
+    "RunStandalone": True,
+    "Username": "daemon",
+    "Groupname": "daemon",
+    "ServerType": "singleprocess",
+    "MultiProcess": {
+        "NumProcesses": 10,
+        "LoadBalancer": {
+            "Enabled": True,
+            "Scheduler": "leastconns",
         },
-    }
+    },
 
+    # Service ACLs
+    "SACLEnable": False,
+
+    # Non-standard CalDAV extensions
+    "DropBoxEnabled": False,
+    "NotificationsEnabled": False,
+
+    # Twistd
+    "twistdLocation": "/usr/share/caldavd/bin/twistd",
+
+    # Python director
+    "pydirLocation": "/usr/share/caldavd/bin/pydir++.py",
+    "pydirConfig"  : "/etc/caldavd/pydir.xml",
+}
+
 class Config (object):
     def __init__(self, defaults):
         self.update(defaults)

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