[CalendarServer-changes] [9223] CalendarServer/branches/users/gaya/ldapdirectorybacker/conf

source_changes at macosforge.org source_changes at macosforge.org
Wed May 2 15:08:14 PDT 2012


Revision: 9223
          http://trac.macosforge.org/projects/calendarserver/changeset/9223
Author:   gaya at apple.com
Date:     2012-05-02 15:08:14 -0700 (Wed, 02 May 2012)
Log Message:
-----------
sync cardav-*.plists with caldavd-test.plist

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest.plist
    CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest2.plist
    CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-odtest.plist
    CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-xmltest.plist

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest.plist
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest.plist	2012-05-02 22:04:37 UTC (rev 9222)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest.plist	2012-05-02 22:08:14 UTC (rev 9223)
@@ -32,7 +32,7 @@
 
     <!-- Network host name [empty = system host name] -->
     <key>ServerHostName</key>
-    <string></string> <!-- The hostname clients use when connecting -->
+    <string>localhost</string> <!-- The hostname clients use when connecting -->
 
     <!-- Enable Calendars -->
     <key>EnableCalDAV</key>
@@ -250,7 +250,7 @@
           <key>base</key>
           <string>dc=example,dc=com</string>
           <key>guidAttr</key>
-          <string>apple-generateduid</string>
+          <string>entryUUID</string>
           <key>users</key>
           <dict>
             <key>rdn</key>
@@ -634,6 +634,21 @@
 
       <key>Services</key>
       <dict>
+
+        <key>AMPNotifier</key>
+        <dict>
+          <key>Service</key>
+          <string>calendarserver.push.amppush.AMPPushNotifierService</string>
+          <key>Enabled</key>
+          <true/>
+          <key>Port</key>
+          <integer>62311</integer>
+          <key>EnableStaggering</key>
+          <false/>
+          <key>StaggerSeconds</key>
+          <integer>3</integer>
+        </dict>
+
         <key>SimpleLineNotifier</key>
         <dict>
           <!-- Simple line notification service (for testing) -->

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest2.plist
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest2.plist	2012-05-02 22:04:37 UTC (rev 9222)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-ldaptest2.plist	2012-05-02 22:08:14 UTC (rev 9223)
@@ -32,7 +32,7 @@
 
     <!-- Network host name [empty = system host name] -->
     <key>ServerHostName</key>
-    <string></string> <!-- The hostname clients use when connecting -->
+    <string>localhost</string> <!-- The hostname clients use when connecting -->
 
     <!-- Enable Calendars -->
     <key>EnableCalDAV</key>
@@ -250,7 +250,7 @@
           <key>base</key>
           <string>dc=example,dc=com</string>
           <key>guidAttr</key>
-          <string>apple-generateduid</string>
+          <string>entryUUID</string>
           <key>users</key>
           <dict>
             <key>rdn</key>
@@ -634,6 +634,21 @@
 
       <key>Services</key>
       <dict>
+
+        <key>AMPNotifier</key>
+        <dict>
+          <key>Service</key>
+          <string>calendarserver.push.amppush.AMPPushNotifierService</string>
+          <key>Enabled</key>
+          <true/>
+          <key>Port</key>
+          <integer>62311</integer>
+          <key>EnableStaggering</key>
+          <false/>
+          <key>StaggerSeconds</key>
+          <integer>3</integer>
+        </dict>
+
         <key>SimpleLineNotifier</key>
         <dict>
           <!-- Simple line notification service (for testing) -->

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-odtest.plist
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-odtest.plist	2012-05-02 22:04:37 UTC (rev 9222)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-odtest.plist	2012-05-02 22:08:14 UTC (rev 9223)
@@ -32,7 +32,7 @@
 
     <!-- Network host name [empty = system host name] -->
     <key>ServerHostName</key>
-    <string></string> <!-- The hostname clients use when connecting -->
+    <string>localhost</string> <!-- The hostname clients use when connecting -->
 
     <!-- Enable Calendars -->
     <key>EnableCalDAV</key>
@@ -250,7 +250,7 @@
           <key>base</key>
           <string>dc=example,dc=com</string>
           <key>guidAttr</key>
-          <string>apple-generateduid</string>
+          <string>entryUUID</string>
           <key>users</key>
           <dict>
             <key>rdn</key>
@@ -634,6 +634,21 @@
 
       <key>Services</key>
       <dict>
+
+        <key>AMPNotifier</key>
+        <dict>
+          <key>Service</key>
+          <string>calendarserver.push.amppush.AMPPushNotifierService</string>
+          <key>Enabled</key>
+          <true/>
+          <key>Port</key>
+          <integer>62311</integer>
+          <key>EnableStaggering</key>
+          <false/>
+          <key>StaggerSeconds</key>
+          <integer>3</integer>
+        </dict>
+
         <key>SimpleLineNotifier</key>
         <dict>
           <!-- Simple line notification service (for testing) -->

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-xmltest.plist
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-xmltest.plist	2012-05-02 22:04:37 UTC (rev 9222)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/conf/carddav-xmltest.plist	2012-05-02 22:08:14 UTC (rev 9223)
@@ -32,7 +32,7 @@
 
     <!-- Network host name [empty = system host name] -->
     <key>ServerHostName</key>
-    <string></string> <!-- The hostname clients use when connecting -->
+    <string>localhost</string> <!-- The hostname clients use when connecting -->
 
     <!-- Enable Calendars -->
     <key>EnableCalDAV</key>
@@ -250,7 +250,7 @@
           <key>base</key>
           <string>dc=example,dc=com</string>
           <key>guidAttr</key>
-          <string>apple-generateduid</string>
+          <string>entryUUID</string>
           <key>users</key>
           <dict>
             <key>rdn</key>
@@ -543,7 +543,7 @@
 
     <!-- Log levels -->
     <key>DefaultLogLevel</key>
-    <string>debug</string> <!-- debug, info, warn, error -->
+    <string>info</string> <!-- debug, info, warn, error -->
 
     <!-- Log level overrides for specific functionality -->
     <key>LogLevels</key>
@@ -634,6 +634,21 @@
 
       <key>Services</key>
       <dict>
+
+        <key>AMPNotifier</key>
+        <dict>
+          <key>Service</key>
+          <string>calendarserver.push.amppush.AMPPushNotifierService</string>
+          <key>Enabled</key>
+          <true/>
+          <key>Port</key>
+          <integer>62311</integer>
+          <key>EnableStaggering</key>
+          <false/>
+          <key>StaggerSeconds</key>
+          <integer>3</integer>
+        </dict>
+
         <key>SimpleLineNotifier</key>
         <dict>
           <!-- Simple line notification service (for testing) -->
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120502/723baedf/attachment-0001.html>


More information about the calendarserver-changes mailing list