[CalendarServer-changes] [1265] CalendarServer/trunk/conf

[source_changes at macosforge.org]

Revision: 1265
          http://trac.macosforge.org/projects/calendarserver/changeset/1265
Author:   cdaboo at apple.com
Date:     2007-02-24 19:50:48 -0800 (Sat, 24 Feb 2007)

Log Message:
-----------
Add back some missing items that are needed to run. The LoadBalancer has to be present when using something other
than Slave as the ProcessType. The twistd location is needed for test systems that may not have twistd installed
in /usr/share/...

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test-logged.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-24 18:32:54 UTC (rev 1264)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-25 03:50:48 UTC (rev 1265)
@@ -285,6 +285,25 @@
   <dict>
     <key>ProcessCount</key>
     <integer>4</integer>
+
+    <key>LoadBalancer</key>
+    <dict>
+      <key>Enabled</key>
+      <false/>
+
+	  <!-- One of the strings below must be used - the others commented out -->
+      <key>Scheduler</key>
+
+      <!-- Least Connections -->
+      <string>LeastConnections</string>
+
+      <!-- Round Robin -->
+      <!-- <string>RoundRobin</string> -->
+
+      <!-- Least Connections and Round Robin -->
+      <!-- <string>LeastConnectionsAndRoundRobin</string> -->
+    </dict>
+
   </dict>
 
 
@@ -308,7 +327,16 @@
   <key>EnableNotifications</key>
   <true/>
 
+  <!--
+    Twisted
+  -->
 
+  <key>Twisted</key>
+  <dict>
+      <key>twistd</key>
+      <string>../Twisted/bin/twistd</string>
+  </dict>
+
   <!--
     Python Director
   -->

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-24 18:32:54 UTC (rev 1264)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-25 03:50:48 UTC (rev 1265)
@@ -285,6 +285,25 @@
   <dict>
     <key>ProcessCount</key>
     <integer>4</integer>
+
+    <key>LoadBalancer</key>
+    <dict>
+      <key>Enabled</key>
+      <false/>
+
+	  <!-- One of the strings below must be used - the others commented out -->
+      <key>Scheduler</key>
+
+      <!-- Least Connections -->
+      <string>LeastConnections</string>
+
+      <!-- Round Robin -->
+      <!-- <string>RoundRobin</string> -->
+
+      <!-- Least Connections and Round Robin -->
+      <!-- <string>LeastConnectionsAndRoundRobin</string> -->
+    </dict>
+
   </dict>
 
 
@@ -308,7 +327,16 @@
   <key>EnableNotifications</key>
   <true/>
 
+  <!--
+    Twisted
+  -->
 
+  <key>Twisted</key>
+  <dict>
+      <key>twistd</key>
+      <string>../Twisted/bin/twistd</string>
+  </dict>
+
   <!--
     Python Director
   -->

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-24 18:32:54 UTC (rev 1264)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-25 03:50:48 UTC (rev 1265)
@@ -232,6 +232,25 @@
   <dict>
     <key>ProcessCount</key>
     <integer>4</integer>
+
+    <key>LoadBalancer</key>
+    <dict>
+      <key>Enabled</key>
+      <false/>
+
+	  <!-- One of the strings below must be used - the others commented out -->
+      <key>Scheduler</key>
+
+      <!-- Least Connections -->
+      <string>LeastConnections</string>
+
+      <!-- Round Robin -->
+      <!-- <string>RoundRobin</string> -->
+
+      <!-- Least Connections and Round Robin -->
+      <!-- <string>LeastConnectionsAndRoundRobin</string> -->
+    </dict>
+
   </dict>
 
 

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