[CalendarServer-changes] [9303] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 9303
          http://trac.macosforge.org/projects/calendarserver/changeset/9303
Author:   sagen at apple.com
Date:     2012-05-27 06:57:47 -0700 (Sun, 27 May 2012)
Log Message:
-----------
Rather than adding a PromotionExtra script to install the contacts plists, if we drop them into SIPP/private/etc/apache2/webapps then webPromotionSetup will ditto those into place for us.

Modified Paths:
--------------
    CalendarServer/trunk/support/Makefile.Apple

Removed Paths:
-------------
    CalendarServer/trunk/contrib/migration/calendarwebapps.py

Deleted: CalendarServer/trunk/contrib/migration/calendarwebapps.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarwebapps.py	2012-05-26 17:58:34 UTC (rev 9302)
+++ CalendarServer/trunk/contrib/migration/calendarwebapps.py	2012-05-27 13:57:47 UTC (rev 9303)
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-#
-# PromotionExtra script for calendar server.
-#
-# Copyright (c) 2011-2012 Apple Inc.  All Rights Reserved.
-#
-# IMPORTANT NOTE:  This file is licensed only for use on Apple-labeled
-# computers and is subject to the terms and conditions of the Apple
-# Software License Agreement accompanying the package this file is a
-# part of.  You may not port this file to another platform without
-# Apple's written consent.
-
-import os
-import shutil
-
-SRC_CONFIG_DIR = "/Applications/Server.app/Contents/ServerRoot/private/etc/caldavd"
-WEBAPPS_DIR = "/Library/Server/Web/Config/apache2/webapps"
-WEBAPPS = ("com.apple.webapp.contacts.plist", "com.apple.webapp.contactsssl.plist")
-
-def main():
-
-    # Copy webapp plists
-    for webapp in WEBAPPS:
-        srcPlistPath = os.path.join(SRC_CONFIG_DIR, webapp)
-        shutil.copy(srcPlistPath, WEBAPPS_DIR)
-
-if __name__ == '__main__':
-    main()

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2012-05-26 17:58:34 UTC (rev 9302)
+++ CalendarServer/trunk/support/Makefile.Apple	2012-05-27 13:57:47 UTC (rev 9303)
@@ -33,6 +33,7 @@
 SERVERSETUP = $(SIPP)$(NSSYSTEMDIR)$(NSLIBRARYSUBDIR)/ServerSetup
 
 CALDAVDSUBDIR = /caldavd
+WEBAPPSSUBDIR = /apache2/webapps
 
 PYTHON = $(USRBINDIR)/python
 PY_HOME = $(SIPP)$(SHAREDIR)$(CALDAVDSUBDIR)
@@ -76,8 +77,8 @@
 	$(_v) for so in $$(find "$(DSTROOT)$(PY_HOME)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done 
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)"
 	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd.plist"
-	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/com.apple.webapp.contacts.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/com.apple.webapp.contacts.plist"
-	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/com.apple.webapp.contactsssl.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/com.apple.webapp.contactsssl.plist"
+	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/com.apple.webapp.contacts.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(WEBAPPSSUBDIR)/com.apple.webapp.contacts.plist"
+	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/com.apple.webapp.contactsssl.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(WEBAPPSSUBDIR)/com.apple.webapp.contactsssl.plist"
 	$(_v) chmod -R ugo+r "$(DSTROOT)$(PY_HOME)"
 	$(_v) for f in $$(find "$(DSTROOT)$(SIPP)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done
 
@@ -109,8 +110,6 @@
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SERVERSETUP)/PromotionExtras"
 	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/calendarpromotion.py" "$(DSTROOT)$(SERVERSETUP)/PromotionExtras/59_calendarpromotion.py"
 	$(_v) chmod ugo+x "$(DSTROOT)$(SERVERSETUP)/PromotionExtras/59_calendarpromotion.py"
-	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/calendarwebapps.py" "$(DSTROOT)$(SERVERSETUP)/PromotionExtras/webPromotionSetup_calendar"
-	$(_v) chmod ugo+x "$(DSTROOT)$(SERVERSETUP)/PromotionExtras/webPromotionSetup_calendar"
 	@echo "Installing database configuration scripts..."
 	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SERVERSETUP)/CommonExtras/PostgreSQLExtras"
 	$(_v) $(INSTALL_FILE) "$(Sources)/contrib/create_caldavd_db.sh" "$(DSTROOT)$(SERVERSETUP)/CommonExtras/PostgreSQLExtras/create_caldavd_db.sh"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120527/870c815a/attachment-0001.html>