[CalendarServer-changes] [11030] CalendarServer/trunk/calendarserver/tools

[source_changes at macosforge.org]

Revision: 11030
          http://trac.calendarserver.org//changeset/11030
Author:   sagen at apple.com
Date:     2013-04-11 13:31:47 -0700 (Thu, 11 Apr 2013)
Log Message:
-----------
More config keys

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/config.py
    CalendarServer/trunk/calendarserver/tools/test/test_config.py

Modified: CalendarServer/trunk/calendarserver/tools/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/config.py	2013-04-11 16:24:18 UTC (rev 11029)
+++ CalendarServer/trunk/calendarserver/tools/config.py	2013-04-11 20:31:47 UTC (rev 11030)
@@ -32,43 +32,45 @@
 from twistedcaldav.config import config, ConfigDict, ConfigurationError, mergeData
 from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
 WRITABLE_CONFIG_KEYS = [
-    "ServerHostName",
-    "HTTPPort",
-    "SSLPort",
-    "EnableSSL",
-    "RedirectHTTPToHTTPS",
-    "EnableCalDAV",
-    "EnableCardDAV",
-    "DataRoot",
-    "SSLCertificate",
-    "SSLPrivateKey",
-    "SSLAuthorityChain",
-    "EnableSearchAddressBook",
+    "Authentication.Basic.AllowedOverWireUnencrypted",
     "Authentication.Basic.Enabled",
-    "Authentication.Basic.AllowedOverWireUnencrypted",
+    "Authentication.Digest.AllowedOverWireUnencrypted",
     "Authentication.Digest.Enabled",
-    "Authentication.Digest.AllowedOverWireUnencrypted",
+    "Authentication.Kerberos.AllowedOverWireUnencrypted",
     "Authentication.Kerberos.Enabled",
-    "Authentication.Kerberos.AllowedOverWireUnencrypted",
     "Authentication.Wiki.Enabled",
+    "DataRoot",
+    "DefaultLogLevel",
+    "EnableCalDAV",
+    "EnableCardDAV",
+    "EnableSearchAddressBook",
+    "EnableSSL",
+    "HTTPPort",
+    "LogLevels",
+    "Notifications.Services.APNS.CalDAV.AuthorityChainPath",
+    "Notifications.Services.APNS.CalDAV.CertificatePath",
+    "Notifications.Services.APNS.CalDAV.PrivateKeyPath",
+    "Notifications.Services.APNS.CardDAV.AuthorityChainPath",
+    "Notifications.Services.APNS.CardDAV.CertificatePath",
+    "Notifications.Services.APNS.CardDAV.PrivateKeyPath",
+    "Notifications.Services.APNS.Enabled",
+    "RedirectHTTPToHTTPS",
     "Scheduling.iMIP.Enabled",
-    "Scheduling.iMIP.Receiving.Username",
+    "Scheduling.iMIP.Receiving.Port",
     "Scheduling.iMIP.Receiving.Server",
-    "Scheduling.iMIP.Receiving.Port",
     "Scheduling.iMIP.Receiving.Type",
+    "Scheduling.iMIP.Receiving.Username",
     "Scheduling.iMIP.Receiving.UseSSL",
+    "Scheduling.iMIP.Sending.Address",
+    "Scheduling.iMIP.Sending.Port",
+    "Scheduling.iMIP.Sending.Server",
     "Scheduling.iMIP.Sending.Username",
-    "Scheduling.iMIP.Sending.Server",
-    "Scheduling.iMIP.Sending.Port",
     "Scheduling.iMIP.Sending.UseSSL",
-    "Scheduling.iMIP.Sending.Address",
-    "Notifications.Services.APNS.Enabled",
-    "Notifications.Services.APNS.CalDAV.CertificatePath",
-    "Notifications.Services.APNS.CalDAV.AuthorityChainPath",
-    "Notifications.Services.APNS.CalDAV.PrivateKeyPath",
-    "Notifications.Services.APNS.CardDAV.CertificatePath",
-    "Notifications.Services.APNS.CardDAV.AuthorityChainPath",
-    "Notifications.Services.APNS.CardDAV.PrivateKeyPath",
+    "ServerHostName",
+    "SSLAuthorityChain",
+    "SSLCertificate",
+    "SSLPort",
+    "SSLPrivateKey",
 ]
 
 def usage(e=None):

Modified: CalendarServer/trunk/calendarserver/tools/test/test_config.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_config.py	2013-04-11 16:24:18 UTC (rev 11029)
+++ CalendarServer/trunk/calendarserver/tools/test/test_config.py	2013-04-11 20:31:47 UTC (rev 11030)
@@ -100,6 +100,8 @@
         self.assertEquals(results["result"]["EnableCalDAV"], True)
         self.assertEquals(results["result"]["EnableCardDAV"], True)
         self.assertEquals(results["result"]["EnableSSL"], False)
+        self.assertEquals(results["result"]["DefaultLogLevel"], "warn")
+
         self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], False)
         self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/calendar.cer")
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130411/92597e0f/attachment.html>