From: Mike Taylor <mike@indexdata.com>
Date: Mon, 29 Sep 2014 13:02:31 +0000 (+0100)
Subject: Merge
X-Git-Tag: 1.0.0~328
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=462a42a105a50b2ba0d552bcaada36fc38a1b249;hp=0fc946af7aee27a0180ae240938c78243cafe05f

Merge
---

diff --git a/tools/apache2/mkws-tools-mike b/tools/apache2/mkws-tools-mike
index 02417a4..6395167 100644
--- a/tools/apache2/mkws-tools-mike
+++ b/tools/apache2/mkws-tools-mike
@@ -3,8 +3,13 @@
     ErrorLog /var/log/apache2/mkws-tools-error.log
     CustomLog /var/log/apache2/mkws-tools-access.log combined
 
-    DocumentRoot /usr/local/src/git/mkws/tools/htdocs/
+    DocumentRoot /home/mike/git/work/mkws/tools/htdocs/
 
-    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
-    Alias /pazpar2/ /usr/local/src/git/pazpar2/
+    Alias /libjs-pz2/ /home/mike/git/work/libjs-pz2/
+    Alias /pazpar2/ /home/mike/git/work/pazpar2/
+
+    <Directory />
+        Allow from all
+	Require all granted
+    </Directory>
 </VirtualHost>
diff --git a/tools/service-proxy/service-proxy-mike-mac.properties b/tools/service-proxy/service-proxy-mike-mac.properties
new file mode 100644
index 0000000..dca9044
--- /dev/null
+++ b/tools/service-proxy/service-proxy-mike-mac.properties
@@ -0,0 +1,49 @@
+# Service Proxy configuration for MKWS (host sp-mkws.indexdata.com)
+# Initially based on MKC's configuration
+
+# Register plugin classes with custom names
+plugins.relay      = com.indexdata.serviceproxy.plugins.Pazpar2RelayPlugin
+plugins.authn      = com.indexdata.serviceproxy.plugins.AuthNTorusPlugin
+plugins.categories = com.indexdata.serviceproxy.plugins.TargetCategoriesPlugin
+plugins.ils        = com.indexdata.serviceproxy.plugins.ILSPlugin
+
+
+# Configuration properties for individual plug-ins 
+
+# relay plugin, proxies commands through to Pazpar2
+relay.PROXY_MODE = 3
+relay.PAZPAR2_URL = http://localhost:8004
+relay.PAZPAR2_SERVICE_ID = mkc
+relay.TORUS_BASEURL = http://x.mkc-admin.indexdata.com:8181/torus2/
+relay.TORUS_REALM = *
+relay.TORUS_PARAMS = ?param1=value1
+relay.STREAMBUFF_SIZE = 4096
+relay.PARSE_RESPONSES = true
+relay.CF_ENGINE_ADDRESS = localhost:9003
+
+# authn plugin, for torus based authentication 
+authn.TORUS_URL        = http://x.mkc-admin.indexdata.com:8181/torus2/identity.USERS/records/
+authn.MASTER_TORUS_URL = http://x.mkc-admin.indexdata.com:8181/torus2/admin.admin/records/
+authn.ACTION_SEQUENCE = check,login,referrer,constraint,ipauth
+authn.SPECIFIC_CONSTRAINT = hostName=${thisHost} 
+
+# categories plugin, for Torus-based target categories
+categories.TORUS_BASEURL            = http://x.mkc-admin.indexdata.com:8181/torus2/
+categories.TORUS_BASEURL_SEARCHABLE = http://x.mkc-admin.indexdata.com:8181/torus2/
+categories.EXCLUDE_EMPTY_CATEGORIES = true
+
+# ils plugin, for ILS operations such as holds and renewals
+ils.CFWS_URL = http://localhost:9003/connector
+
+
+# Map SP commands to command-separated sequences of plugins
+chains.auth = authn
+chains.categories = categories
+chains.ils = ils
+# Map all other commands to the Pazpar2 relayer
+chains.* = relay
+
+
+# Just so I can check that this particular SP config is in use
+chains.mike = info
+plugins.info = com.indexdata.serviceproxy.plugins.InfoPlugin