[CalendarServer-changes] [8500] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 8500
          http://trac.macosforge.org/projects/calendarserver/changeset/8500
Author:   sagen at apple.com
Date:     2012-01-10 10:23:18 -0800 (Tue, 10 Jan 2012)
Log Message:
-----------
More unbundling relocations

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py
    CalendarServer/trunk/calendarserver/tools/changeip_calendar.py
    CalendarServer/trunk/calendarserver/tools/fixcalendardata.py
    CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py

Modified: CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py	2012-01-10 17:53:38 UTC (rev 8499)
+++ CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py	2012-01-10 18:23:18 UTC (rev 8500)
@@ -23,7 +23,7 @@
 CONNECTNAME   = "_postgres"
 USERNAME      = "caldav"
 DATABASENAME  = "caldav"
-SCHEMAFILE    = "/usr/share/caldavd/lib/python/txdav/common/datastore/sql_schema/current.sql"
+SCHEMAFILE    = "/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/txdav/common/datastore/sql_schema/current.sql"
 
 # Executables:
 CREATEDB      = "/usr/bin/createdb"

Modified: CalendarServer/trunk/calendarserver/tools/changeip_calendar.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/changeip_calendar.py	2012-01-10 17:53:38 UTC (rev 8499)
+++ CalendarServer/trunk/calendarserver/tools/changeip_calendar.py	2012-01-10 18:23:18 UTC (rev 8500)
@@ -54,7 +54,7 @@
         sys.exit(1)
 
     verbose = False
-    configFile = "/etc/caldavd/caldavd.plist"
+    configFile = "/Library/Server/Calendar and Contacts/Config/caldavd.plist"
 
     for opt, arg in optargs:
         if opt in ("-h", "--help"):

Modified: CalendarServer/trunk/calendarserver/tools/fixcalendardata.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/fixcalendardata.py	2012-01-10 17:53:38 UTC (rev 8499)
+++ CalendarServer/trunk/calendarserver/tools/fixcalendardata.py	2012-01-10 18:23:18 UTC (rev 8500)
@@ -27,7 +27,7 @@
 
 from plistlib import readPlist
 
-PLIST_FILE = "/etc/caldavd/caldavd.plist"
+PLIST_FILE = "/Library/Server/Calendar and Contacts/Config/caldavd.plist"
 SCAN_FILE = "problems.txt"
 
 totalProblems = 0

Modified: CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py
===================================================================
--- CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py	2012-01-10 17:53:38 UTC (rev 8499)
+++ CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py	2012-01-10 18:23:18 UTC (rev 8500)
@@ -25,7 +25,7 @@
 
 LOG = "/var/log/caldavd/certupdate.log"
 SERVICE_NAME = "calendar"
-CALDAVD_PLIST = "/etc/caldavd/caldavd.plist"
+CALDAVD_PLIST = "/Library/Server/Calendar and Contacts/Config/caldavd.plist"
 SERVER_ADMIN = "/usr/sbin/serveradmin"
 
 def main():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120110/464cd742/attachment.html>