[CalendarServer-changes] [9302] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Sat May 26 10:58:36 PDT 2012


Revision: 9302
          http://trac.macosforge.org/projects/calendarserver/changeset/9302
Author:   sagen at apple.com
Date:     2012-05-26 10:58:34 -0700 (Sat, 26 May 2012)
Log Message:
-----------
Adds webapp plists for reverse proxying /addressbooks

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

Added Paths:
-----------
    CalendarServer/trunk/contrib/migration/calendarwebapps.py
    CalendarServer/trunk/contrib/migration/com.apple.webapp.contacts.plist
    CalendarServer/trunk/contrib/migration/com.apple.webapp.contactsssl.plist

Added: CalendarServer/trunk/contrib/migration/calendarwebapps.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarwebapps.py	                        (rev 0)
+++ CalendarServer/trunk/contrib/migration/calendarwebapps.py	2012-05-26 17:58:34 UTC (rev 9302)
@@ -0,0 +1,28 @@
+#!/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()

Added: CalendarServer/trunk/contrib/migration/com.apple.webapp.contacts.plist
===================================================================
--- CalendarServer/trunk/contrib/migration/com.apple.webapp.contacts.plist	                        (rev 0)
+++ CalendarServer/trunk/contrib/migration/com.apple.webapp.contacts.plist	2012-05-26 17:58:34 UTC (rev 9302)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>name</key>
+		<string>com.apple.webapp.contacts</string>
+		<key>includeFiles</key>
+		<array>
+			<string>/Library/Server/Web/Config/apache2/httpd_calendarserver.conf</string>
+		</array>
+		<key>proxies</key>
+		<dict>
+			<key>/.well-known</key>
+			<dict>
+				<key>path</key>
+				<string>/.well-known</string>
+				<key>urls</key>
+				<array>
+					<string>http://localhost:8008/.well-known</string>
+				</array>
+			</dict>
+			<key>/addressbooks</key>
+			<dict>
+				<key>path</key>
+				<string>/addressbooks</string>
+				<key>urls</key>
+				<array>
+					<string>http://localhost:8008/addressbooks</string>
+				</array>
+			</dict>
+			<key>/principals</key>
+			<dict>
+				<key>path</key>
+				<string>/principals</string>
+				<key>urls</key>
+				<array>
+					<string>http://localhost:8008/principals</string>
+				</array>
+			</dict>
+		</dict>
+		<key>requiredModuleNames</key>
+		<array>
+			<string>proxy_module</string>
+			<string>headers_module</string>
+		</array>
+		<key>sslPolicy</key>
+		<integer>4</integer> <!-- XSUseSSLAndNonSSL -->
+	</dict>
+</plist>

Added: CalendarServer/trunk/contrib/migration/com.apple.webapp.contactsssl.plist
===================================================================
--- CalendarServer/trunk/contrib/migration/com.apple.webapp.contactsssl.plist	                        (rev 0)
+++ CalendarServer/trunk/contrib/migration/com.apple.webapp.contactsssl.plist	2012-05-26 17:58:34 UTC (rev 9302)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>name</key>
+		<string>com.apple.webapp.contactsssl</string>
+		<key>includeFiles</key>
+		<array>
+			<string>/Library/Server/Web/Config/apache2/httpd_calendarserver.conf</string>
+		</array>
+		<key>proxies</key>
+		<dict>
+			<key>/.well-known</key>
+			<dict>
+				<key>path</key>
+				<string>/.well-known</string>
+				<key>urls</key>
+				<array>
+					<string>https://localhost:8443/.well-known</string>
+				</array>
+			</dict>
+			<key>/addressbooks</key>
+			<dict>
+				<key>path</key>
+				<string>/addressbooks</string>
+				<key>urls</key>
+				<array>
+					<string>https://localhost:8443/addressbooks</string>
+				</array>
+			</dict>
+			<key>/principals</key>
+			<dict>
+				<key>path</key>
+				<string>/principals</string>
+				<key>urls</key>
+				<array>
+					<string>https://localhost:8443/principals</string>
+				</array>
+			</dict>
+		</dict>
+		<key>requiredModuleNames</key>
+		<array>
+			<string>proxy_module</string>
+			<string>headers_module</string>
+		</array>
+		<key>sslPolicy</key>
+		<integer>1</integer> <!-- XSUseSSLAlways -->
+	</dict>
+</plist>

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2012-05-25 14:09:14 UTC (rev 9301)
+++ CalendarServer/trunk/support/Makefile.Apple	2012-05-26 17:58:34 UTC (rev 9302)
@@ -76,6 +76,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) 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
 
@@ -107,6 +109,8 @@
 	$(_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/20120526/3515d82c/attachment.html>


More information about the calendarserver-changes mailing list