[CalendarServer-changes] [8551] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 8551
          http://trac.macosforge.org/projects/calendarserver/changeset/8551
Author:   sagen at apple.com
Date:     2012-01-17 10:12:19 -0800 (Tue, 17 Jan 2012)
Log Message:
-----------
Update to new locations

Modified Paths:
--------------
    CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py
    CalendarServer/trunk/twistedcaldav/backup.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py
===================================================================
--- CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py	2012-01-17 03:25:20 UTC (rev 8550)
+++ CalendarServer/trunk/contrib/certupdate/calendarcertupdate.py	2012-01-17 18:12:19 UTC (rev 8551)
@@ -26,7 +26,7 @@
 LOG = "/var/log/caldavd/certupdate.log"
 SERVICE_NAME = "calendar"
 CALDAVD_PLIST = "/Library/Server/Calendar and Contacts/Config/caldavd.plist"
-SERVER_ADMIN = "/usr/sbin/serveradmin"
+SERVER_ADMIN = "/Applications/Server.app/Contents/ServerRoot/usr/sbin/serveradmin"
 
 def main():
 

Modified: CalendarServer/trunk/twistedcaldav/backup.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/backup.py	2012-01-17 03:25:20 UTC (rev 8550)
+++ CalendarServer/trunk/twistedcaldav/backup.py	2012-01-17 18:12:19 UTC (rev 8551)
@@ -28,7 +28,7 @@
 VERBOSE = os.environ.get('VERBOSE', False)
 FUNCLOG = os.environ.get('FUNCLOG', False)
 
-SERVERADMIN = "/usr/sbin/serveradmin"
+SERVERADMIN = "/Applications/Server.app/Contents/ServerRoot/usr/sbin/serveradmin"
 
 SBSCONF = "/private/etc/sbs_backup"
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-01-17 03:25:20 UTC (rev 8550)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2012-01-17 18:12:19 UTC (rev 8551)
@@ -447,7 +447,7 @@
     "SSLPrivateKey"      : "",  # Private key
     "SSLAuthorityChain"  : "",  # Certificate Authority Chain
     "SSLPassPhraseDialog": "/etc/apache2/getsslpassphrase",
-    "SSLCertAdmin"       : "/usr/sbin/certadmin",
+    "SSLCertAdmin"       : "/Applications/Server.app/Contents/ServerRoot/usr/sbin/certadmin",
 
     #
     # Process management
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120117/cbe4a243/attachment.html>