From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 9 Jul 2013 12:14:57 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 0.9.1~305^2~3
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=d752b5f39282e42b4f8abe08d7ac5a1a4768e1d5;hp=01ddd6b2881dee0718f697c242197aaf3468c4de;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
---

diff --git a/examples/apache2/mkws-examples b/examples/apache2/mkws-examples
new file mode 100644
index 0000000..bb76cd1
--- /dev/null
+++ b/examples/apache2/mkws-examples
@@ -0,0 +1,6 @@
+<VirtualHost *:80>
+    ServerName example.indexdata.com
+    DocumentRoot /home/indexdata/mkws/examples/htdocs/
+    ErrorLog /var/log/apache2/mkws-examples-error.log
+    CustomLog /var/log/apache2/mkws-examples-access.log combined
+</VirtualHost>
diff --git a/examples/apache2/mkws-examples-proxy b/examples/apache2/mkws-examples-proxy
new file mode 100644
index 0000000..7fb168b
--- /dev/null
+++ b/examples/apache2/mkws-examples-proxy
@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+    ServerName example.indexdata.com
+
+    ProxyRequests off
+    ProxyVia On
+    ProxyPreserveHost On
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+
+    ProxyPass         / http://caliban:80/
+    ProxyPassReverse  / http://caliban:80/
+
+    # These are the logs for the proxying operation
+    ErrorLog /var/log/apache2/mkws-examples-proxy-error.log
+    CustomLog /var/log/apache2/mkws-examples-proxy-access.log combined
+</VirtualHost>
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index dfa7ed4..aac6d2a 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -1,24 +1,14 @@
 # Configuration for the apache web server
 # Running on caliban
 
-
-<VirtualHost *:80>
-    ServerName somesite.indexdata.com
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    ErrorLog /var/log/apache2/somesite-error.log
-    CustomLog /var/log/apache2/somesite-access.log combined
-</VirtualHost>
-
-
 <VirtualHost *:80>
     ServerName mkws.indexdata.com
 
     ErrorLog /var/log/apache2/mkws-error.log
     CustomLog /var/log/apache2/mkws-access.log combined
 
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
+    DocumentRoot /home/indexdata/mkws/tools/htdocs
     Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
-    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
 
     RewriteEngine on
     RewriteLogLevel 1
@@ -32,7 +22,7 @@
     ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
 
     PerlOptions +Parent
-    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
     <Location /service-proxy>
         PerlOutputFilterHandler MyApache2::SetACAO
     </Location>
diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike
index 44efb2b..e31347b 100644
--- a/tools/apache2/mkws-mike
+++ b/tools/apache2/mkws-mike
@@ -2,11 +2,11 @@
 # Running on Mike's local development box
 
 <VirtualHost *:80>
-    ServerName x.spclient.indexdata.com
-    ErrorLog /var/log/apache2/spclient-error.log
-    CustomLog /var/log/apache2/spclient-access.log combined
+    ServerName x.mkws.indexdata.com
+    ErrorLog /var/log/apache2/mkws-error.log
+    CustomLog /var/log/apache2/mkws-access.log combined
 
-    DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
+    DocumentRoot /usr/local/src/git/mkws/tools/htdocs
     Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
 
     RewriteEngine on
diff --git a/tools/apache2/mkws-proxy b/tools/apache2/mkws-proxy
index c914008..1ec95b5 100644
--- a/tools/apache2/mkws-proxy
+++ b/tools/apache2/mkws-proxy
@@ -1,6 +1,5 @@
 <VirtualHost *:80>
     ServerName mkws.indexdata.com
-    ServerAlias example.indexdata.com
 
     ProxyRequests off
     ProxyVia On
diff --git a/tools/htdocs/README b/tools/htdocs/README
index bcd492c..0c4d98d 100644
--- a/tools/htdocs/README
+++ b/tools/htdocs/README
@@ -12,7 +12,7 @@ The goal is to make it that as much of the searching functionality as
 possible is hosted on
 	http://mkws.indexdata.com/
 so that very simple websites such as
-	http://somesite.indexdata.com/
+	http://example.indexdata.com/
 can have MasterKey searching with minimal effort.
 
 The following files must be hosted on mkws.indexdata.com:
diff --git a/tools/htdocs/index.html b/tools/htdocs/index.html
index 570f42e..7b90bcc 100644
--- a/tools/htdocs/index.html
+++ b/tools/htdocs/index.html
@@ -55,12 +55,12 @@
     <ul>
       <li>
         A very simple application at
-        <a href="http://somesite.indexdata.com/"
-                >http://somesite.indexdata.com/</a>.
+        <a href="http://example.indexdata.com/"
+                >http://example.indexdata.com/</a>.
         It's worth viewing the source to see how small it is.
       </li>
       <li>
-        <a href="http://somesite.indexdata.com/index-full.html"
+        <a href="http://example.indexdata.com/index-full.html"
            >A more detailed version</a>
 	that contains a configuration structure instead of accepting
         the defaults. Includes a custom translation option to present
@@ -68,25 +68,25 @@
       </li>
       <li>
         The
-        <a href="http://somesite.indexdata.com/index-jquery.html"
+        <a href="http://example.indexdata.com/index-jquery.html"
            >jQuery plugin</a>
         version, consisting of a single line of JavaScript code.
       </li>
       <li>
 	An application that
-	<a href="http://somesite.indexdata.com/index-lowlevel.html"
+	<a href="http://example.indexdata.com/index-lowlevel.html"
 	   >uses lower-level MKWS components</a>
 	rather than the all-in-one <tt>#mkwsResults</tt> division,
 	allowing it to use a rather different layout.
       </li>
       <li>
-        <a href="http://somesite.indexdata.com/index-mobile.html"
+        <a href="http://example.indexdata.com/index-mobile.html"
            >A version suitable for mobile devices</a>,
 	with a responsive design that moves components around
         depending on the screen size.
       </li>
       <li>
-        <a href="http://somesite.indexdata.com/index-popup.html"
+        <a href="http://example.indexdata.com/index-popup.html"
            >A version that uses a jQuery popup</a>.
       </li>
       <li>