[CalendarServer-changes] [932] CalendarServer/branches/users/dreid/cluster

[source_changes at macosforge.org]

Revision: 932
          http://trac.macosforge.org/projects/calendarserver/changeset/932
Author:   dreid at apple.com
Date:     2007-01-05 08:57:13 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Fix patchmaker, remove support for PyDirector's admin interface

Modified Paths:
--------------
    CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist
    CalendarServer/branches/users/dreid/cluster/support/patchmaker.py
    CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py

Modified: CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist	2007-01-05 05:20:54 UTC (rev 931)
+++ CalendarServer/branches/users/dreid/cluster/conf/caldavd.plist	2007-01-05 16:57:13 UTC (rev 932)
@@ -130,15 +130,6 @@
 
       <key>Scheduler</key>
       <string>leastconns</string>
-
-      <key>admin</key>
-      <dict>
-        <key>username</key>
-        <string></string>
-
-        <key>password</key>
-        <string></string>
-      </dict>
     </dict>    
   </dict>
 

Modified: CalendarServer/branches/users/dreid/cluster/support/patchmaker.py
===================================================================
--- CalendarServer/branches/users/dreid/cluster/support/patchmaker.py	2007-01-05 05:20:54 UTC (rev 931)
+++ CalendarServer/branches/users/dreid/cluster/support/patchmaker.py	2007-01-05 16:57:13 UTC (rev 932)
@@ -30,7 +30,7 @@
 cwd = os.getcwd()
 libpatches = os.path.join(cwd, "lib-patches")
 
-svn = "/usr/local/bin/svn"
+svn = "/usr/bin/svn"
 
 # Stuff we have to manually ignore because our ignore logic cannot cope
 ignores = set((

Modified: CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py	2007-01-05 05:20:54 UTC (rev 931)
+++ CalendarServer/branches/users/dreid/cluster/twistedcaldav/cluster.py	2007-01-05 16:57:13 UTC (rev 932)
@@ -19,9 +19,6 @@
 configTemplate = """
 <pdconfig>
     %(services)s
-    <admin listen="localhost:7001">
-	<user name="%(username)s" password="%(password)s" access="full"/>
-    </admin>
 </pdconfig>
 """
 
@@ -133,10 +130,6 @@
 
         pdconfig = configTemplate % {
             'services': '\n'.join(services),
-            'username': 
-                config.MultiProcess['PyDirector']['admin']['username'],
-            'password': 
-                config.MultiProcess['PyDirector']['admin']['password'],
             }
                 
         fd, fname = tempfile.mkstemp(prefix='pydir')

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