From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 22 Sep 2014 14:14:39 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~24
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a28667229f37a181910a8d5fff3815c1e3949057;hp=244089d78df940bd77bd3dbdc10bdbb77e0e9838;p=mkws-moved-to-github.git

Merge branch 'master' into templateallthemarkup
---

diff --git a/doc/mkws-manual.markdown b/doc/mkws-manual.markdown
index 79b396e..fa86847 100644
--- a/doc/mkws-manual.markdown
+++ b/doc/mkws-manual.markdown
@@ -482,7 +482,7 @@ yourname.com:
 Step 1: add a rewriting authentication alias to the configuration:
 
 	RewriteEngine on
-	RewriteRule /spauth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=check,login&username=U&password=PW [P]
+	RewriteRule /spauth/ http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=check,login&username=U&password=PW [P]
 
 Step 2: set the MKWS configuration item `service_proxy_auth` to
 <http://yourname.com/spauth/>
@@ -620,9 +620,9 @@ structure.
 
 3. [10, 20, 30, 50]
 
-4. http://mkws.indexdata.com/service-proxy-auth
+4. http://sp-mkws.indexdata.com/service-proxy-auth
 
-5. http://mkws.indexdata.com/service-proxy/
+5. http://sp-mkws.indexdata.com/service-proxy/
 
 6. [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]]
 
diff --git a/examples/apache2/mkws-examples b/examples/apache2/mkws-examples
index 42f0673..86f7cf2 100644
--- a/examples/apache2/mkws-examples
+++ b/examples/apache2/mkws-examples
@@ -11,7 +11,7 @@
     CustomLog /var/log/apache2/mkws-examples-access.log combined
 
     RewriteEngine on
-    RewriteRule /service-proxy-auth http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
+    RewriteRule /service-proxy-auth http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
     #RewriteLog /var/log/apache2/mkws-examples-rewrite.log
     #RewriteLogLevel 9
 </VirtualHost>
diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike
index 757e785..1f0ae6d 100644
--- a/examples/apache2/mkws-examples-mike
+++ b/examples/apache2/mkws-examples-mike
@@ -14,7 +14,7 @@
     CustomLog /var/log/apache2/mkws-examples-access.log combined
 
     RewriteEngine on
-    RewriteRule      /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
+    RewriteRule      /service-proxy-auth/ http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
     #RewriteLog /var/log/apache2/mkws-examples-rewrite.log
     #RewriteLogLevel 9
 </VirtualHost>
diff --git a/examples/htdocs/auto-paratext-minimal.html b/examples/htdocs/auto-paratext-minimal.html
index 24f14cc..8ee72ab 100644
--- a/examples/htdocs/auto-paratext-minimal.html
+++ b/examples/htdocs/auto-paratext-minimal.html
@@ -2,7 +2,7 @@
   <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
   <script type="text/javascript">
     mkws_config = {
-      service_proxy_auth: "http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc",
+      service_proxy_auth: "http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc",
       perpage_default: 5,
    };
   </script>
diff --git a/examples/htdocs/auto-paratext.html b/examples/htdocs/auto-paratext.html
index b7c0b88..7d5350b 100644
--- a/examples/htdocs/auto-paratext.html
+++ b/examples/htdocs/auto-paratext.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript">
       mkws_config = {
-        service_proxy_auth: "http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc",
+        service_proxy_auth: "http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc",
 	perpage_default: 5,
      };
     </script>
diff --git a/examples/htdocs/dict.html b/examples/htdocs/dict.html
index 9aac803..a8edd79 100644
--- a/examples/htdocs/dict.html
+++ b/examples/htdocs/dict.html
@@ -6,7 +6,7 @@
       var mkws_config = {
             //responsive_design_width: 990
             //perpage_default: 10,
-            service_proxy_auth: "//mkws.indexdata.com/service-proxy/?command=auth&action=login&username=dic&password=dic"
+            service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=dic&password=dic"
         };
     </script>
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
diff --git a/examples/htdocs/intro.html b/examples/htdocs/intro.html
index 8f97ab5..f315e56 100644
--- a/examples/htdocs/intro.html
+++ b/examples/htdocs/intro.html
@@ -4,7 +4,7 @@
     <title>MKWS demo: Reference Universe widget</title>
     <link rel="stylesheet" type="text/css" href="mkws-widget-credo.css" />
     <script type="text/javascript">
-      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-credoauth" };
+      var mkws_config = { service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-credoauth" };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//x.mkws.indexdata.com/jquery.json-2.4.js"></script>
diff --git a/examples/htdocs/jasmine-cors-popup.html b/examples/htdocs/jasmine-cors-popup.html
index a910bee..4e8cb6f 100644
--- a/examples/htdocs/jasmine-cors-popup.html
+++ b/examples/htdocs/jasmine-cors-popup.html
@@ -49,7 +49,7 @@
 
     <script type="text/javascript">
     var mkws_config = {
-      service_proxy_auth: "//mkws.indexdata.com/service-proxy-testauth",
+      service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-testauth",
       perpage_default: 10
     };
 
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 533dd4e..a6d1fff 100644
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -53,8 +53,8 @@
     // use a our main service proxy with mkws test account
     var mkws_config = {
       perpage_default: 10,
-      pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
-      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
+      pazpar2_url:          "//sp-mkws.indexdata.com/service-proxy/",
+      service_proxy_auth:   "//sp-mkws.indexdata.com/service-proxy-testauth"
     };
 
     var jasmine_config = {
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index afbe943..646131d 100644
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -5,8 +5,8 @@
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-	  pazpar2_url : "//mkws.indexdata.com/service-proxy/",
-	  service_proxy_auth: "//mkws.indexdata.com/service-proxy-testauth",
+	  pazpar2_url : "//sp-mkws.indexdata.com/service-proxy/",
+	  service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-testauth",
 	  perpage_default: 10
       };
     </script>
diff --git a/examples/htdocs/mike2.html b/examples/htdocs/mike2.html
index 188cbc2..45e28f9 100644
--- a/examples/htdocs/mike2.html
+++ b/examples/htdocs/mike2.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-        service_proxy_auth: "//mkws.indexdata.com/service-proxy/?command=auth&action=check,login&username=mkwstest&password=mkwstest"
+        service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=check,login&username=mkwstest&password=mkwstest"
       };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
diff --git a/examples/htdocs/mkws-widget-ru.js b/examples/htdocs/mkws-widget-ru.js
index 55b4488..2ba8a0d 100644
--- a/examples/htdocs/mkws-widget-ru.js
+++ b/examples/htdocs/mkws-widget-ru.js
@@ -1,5 +1,5 @@
 var mkws_config = {
-   service_proxy_auth: "http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc"
+   service_proxy_auth: "http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc"
 };
 
 mkws.registerWidgetType('ReferenceUniverse', function() {
diff --git a/examples/htdocs/popup-dev.html b/examples/htdocs/popup-dev.html
index 174fc37..585d9e8 100644
--- a/examples/htdocs/popup-dev.html
+++ b/examples/htdocs/popup-dev.html
@@ -9,7 +9,7 @@
 
     <script type="text/javascript">
       var mkws_config = {
-      	  service_proxy_auth: "//mkws.indexdata.com/service-proxy-credoauth"
+      	  service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-credoauth"
       };
     </script>
 
diff --git a/examples/htdocs/popup.html b/examples/htdocs/popup.html
index 9a1a35e..41bed1e 100644
--- a/examples/htdocs/popup.html
+++ b/examples/htdocs/popup.html
@@ -9,7 +9,7 @@
 
     <script type="text/javascript">
       var mkws_config = {
-      	  service_proxy_auth: "//mkws.indexdata.com/service-proxy-credoauth"
+      	  service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-credoauth"
       };
     </script>
 
diff --git a/examples/htdocs/ref.html b/examples/htdocs/ref.html
index 9ba47a1..16dda80 100644
--- a/examples/htdocs/ref.html
+++ b/examples/htdocs/ref.html
@@ -4,7 +4,7 @@
     <title>MKWS demo: Compound reference widget</title>
     <link rel="stylesheet" type="text/css" href="mkws-widget-credo.css" />
     <script type="text/javascript">
-      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-credoauth" };
+      var mkws_config = { service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-credoauth" };
     </script>
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
     <script type="text/javascript" src="mkws-widget-credo.js"></script>
diff --git a/examples/htdocs/reference.html b/examples/htdocs/reference.html
index b4cb8ca..0811369 100644
--- a/examples/htdocs/reference.html
+++ b/examples/htdocs/reference.html
@@ -4,7 +4,7 @@
     <title>MKWS demo: Reference Universe widget</title>
     <link rel="stylesheet" type="text/css" href="mkws-widget-reference.css" />
     <script type="text/javascript">
-      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-testauth" };
+      var mkws_config = { service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-testauth" };
     </script>
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
   </head>
diff --git a/examples/htdocs/surlyauto.html b/examples/htdocs/surlyauto.html
index ef9c436..7b0cd71 100644
--- a/examples/htdocs/surlyauto.html
+++ b/examples/htdocs/surlyauto.html
@@ -4,7 +4,7 @@
     <title>MKWS demo: Multiple autosearching widgets get their own teams</title>
     <link rel="stylesheet" type="text/css" href="mkws-widget-reference.css" />
     <script type="text/javascript">
-      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-testauth" };
+      var mkws_config = { service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-testauth" };
     </script>
     <!-- <script type="text/javascript" src="//mkws.local/mkws&#45;complete.js"></script> -->
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 582af95..9b426fb 100644
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -35,8 +35,8 @@
     # mkws devel account (e.g. memached testing)
     RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
 
-    ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+    ProxyPass        /service-proxy/ http://sp-mkws.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkws.indexdata.com/service-proxy/
 
     ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
     ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
diff --git a/tools/bin/nagios-service-proxy.sh b/tools/bin/nagios-service-proxy.sh
index 2904e85..0de766d 100755
--- a/tools/bin/nagios-service-proxy.sh
+++ b/tools/bin/nagios-service-proxy.sh
@@ -4,7 +4,7 @@
 # nagios test if the the service proxy is up and running
 
 set -e
-: ${mkws_host="http://mkws.indexdata.com/service-proxy/"}
+: ${mkws_host="http://sp-mkws.indexdata.com/service-proxy/"}
 : ${mkws_username="mkws"}
 : ${mkws_password="mkws"}
 : ${user_agent="nagios service-proxy v0.9"}