[CalendarServer-changes] [14949] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 6 17:28:42 PDT 2015
Revision: 14949
http://trac.calendarserver.org//changeset/14949
Author: sagen at apple.com
Date: 2015-07-06 17:28:41 -0700 (Mon, 06 Jul 2015)
Log Message:
-----------
APNS cert paths now relative to ConfigRoot
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/config.py
CalendarServer/trunk/calendarserver/tools/test/test_config.py
CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
CalendarServer/trunk/twistedcaldav/stdconfig.py
Modified: CalendarServer/trunk/calendarserver/tools/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/config.py 2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/calendarserver/tools/config.py 2015-07-07 00:28:41 UTC (rev 14949)
@@ -59,12 +59,6 @@
"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",
Modified: CalendarServer/trunk/calendarserver/tools/test/test_config.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_config.py 2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/calendarserver/tools/test/test_config.py 2015-07-07 00:28:41 UTC (rev 14949)
@@ -131,7 +131,6 @@
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")
# Verify not all keys are present, such as umask which is not accessible
self.assertFalse("umask" in results["result"])
@@ -150,7 +149,6 @@
self.assertEquals(results["result"]["EnableCardDAV"], False)
self.assertEquals(results["result"]["EnableSSL"], True)
self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], True)
- self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/changed.cer")
hostName = "hostname_%s_%s" % (unichr(208), u"\ud83d\udca3")
self.assertTrue(results["result"]["ServerHostName"].endswith(hostName))
@@ -242,8 +240,6 @@
<true/>
<key>Notifications.Services.APNS.Enabled</key>
<true/>
- <key>Notifications.Services.APNS.CalDAV.CertificatePath</key>
- <string>/example/changed.cer</string>
<key>ServerRoot</key>
<string>/You/Shall/Not/Pass</string>
<key>ServerHostName</key>
Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2015-07-07 00:28:41 UTC (rev 14949)
@@ -466,7 +466,6 @@
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")
# This is a read only key that is returned
self.assertEquals(results["result"]["ServerRoot"], self.absoluteServerRoot)
@@ -489,7 +488,6 @@
self.assertEquals(results["result"]["EnableCardDAV"], False)
self.assertEquals(results["result"]["EnableSSL"], True)
self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], True)
- self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/changed.cer")
hostName = "hostname_%s_%s" % (unichr(208), u"\ud83d\udca3")
self.assertTrue(results["result"]["ServerHostName"].endswith(hostName))
@@ -972,8 +970,6 @@
<true/>
<key>Notifications.Services.APNS.Enabled</key>
<true/>
- <key>Notifications.Services.APNS.CalDAV.CertificatePath</key>
- <string>/example/changed.cer</string>
<key>ServerHostName</key>
<string>hostname_%s_%s</string>
</dict>
Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-07-07 00:28:41 UTC (rev 14949)
@@ -821,16 +821,16 @@
"EnableStaggering" : False,
"StaggerSeconds" : 3,
"CalDAV" : {
- "CertificatePath" : "",
- "PrivateKeyPath" : "",
- "AuthorityChainPath" : "",
+ "CertificatePath" : "Certificates/apns:com.apple.calendar.cert.pem",
+ "PrivateKeyPath" : "Certificates/apns:com.apple.calendar.key.pem",
+ "AuthorityChainPath" : "Certificates/apns:com.apple.calendar.chain.pem",
"Passphrase" : "",
"Topic" : "",
},
"CardDAV" : {
- "CertificatePath" : "",
- "PrivateKeyPath" : "",
- "AuthorityChainPath" : "",
+ "CertificatePath" : "Certificates/apns:com.apple.contact.cert.pem",
+ "PrivateKeyPath" : "Certificates/apns:com.apple.contact.key.pem",
+ "AuthorityChainPath" : "Certificates/apns:com.apple.contact.chain.pem",
"Passphrase" : "",
"Topic" : "",
},
@@ -1221,6 +1221,12 @@
("ConfigRoot", ("Scheduling", "iSchedule", "DKIM", "PublicKeyFile",)),
("ConfigRoot", ("Scheduling", "iSchedule", "DKIM", "PrivateExchanges",)),
("ConfigRoot", "WritableConfigFile"),
+ ("ConfigRoot", ("Notifications", "Services", "APNS", "CalDAV", "AuthorityChainPath",)),
+ ("ConfigRoot", ("Notifications", "Services", "APNS", "CalDAV", "CertificatePath",)),
+ ("ConfigRoot", ("Notifications", "Services", "APNS", "CalDAV", "PrivateKeyPath",)),
+ ("ConfigRoot", ("Notifications", "Services", "APNS", "CardDAV", "AuthorityChainPath",)),
+ ("ConfigRoot", ("Notifications", "Services", "APNS", "CardDAV", "CertificatePath",)),
+ ("ConfigRoot", ("Notifications", "Services", "APNS", "CardDAV", "PrivateKeyPath",)),
("LogRoot", "AccessLogFile"),
("LogRoot", "ErrorLogFile"),
("LogRoot", "AgentLogFile"),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150706/7260ec11/attachment-0001.html>
More information about the calendarserver-changes
mailing list