projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 23b60f9)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 3 Mar 2014 13:44:40 +0000 (13:44 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 3 Mar 2014 13:44:40 +0000 (13:44 +0000)
examples/htdocs/jasmine-local-popup.html patch | blob | history
examples/htdocs/jasmine-popup.html patch | blob | history
examples/htdocs/wolfram2.html patch | blob | history
tools/apache2/mkws-dev patch | blob | history
tools/apache2/mkws-live patch | blob | history
tools/apache2/mkws-test patch | blob | history

diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 50906df..fe1752d 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -29,10 +29,12 @@
 
   <body>
     <script type="text/javascript">
+
+    // using a local service proxy !!!
     var mkws_config = {
       perpage_default: 10,
       pazpar2_url:          "/service-proxy/",
-      service_proxy_auth:   "/service-proxy-auth"
+      service_proxy_auth:   "/service-proxy-testauth"
     };
 
     var jasmine_config = {
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 7c5c732..3aac786 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -32,7 +32,7 @@
     var mkws_config = {
       perpage_default: 10,
       pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
-      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-auth"
+      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
     };
 
     jQuery.pazpar2({
diff --git a/examples/htdocs/wolfram2.html b/examples/htdocs/wolfram2.html
index 38f9421..0ab5967 100644 (file)
--- a/examples/htdocs/wolfram2.html
+++ b/examples/htdocs/wolfram2.html
@@ -56,7 +56,7 @@
     <script type="text/javascript">
       var mkws_config = {
           pazpar2_url : "/service-proxy/",
-          service_proxy_auth: "/service-proxy-auth",
+          service_proxy_auth: "/service-proxy-testauth",
           perpage_default: 10
       };
     </script>
diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 30f2727..36c99b9 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -26,7 +26,11 @@
         SetOutputFilter DEFLATE 
     </Location> 
 
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
+    # jasmine test account
+    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
+    # mkws devel account (e.g. memached testing)
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
 
     ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
     ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 35f396a..d6f6d07 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -14,8 +14,13 @@
     RewriteEngine on
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-rewrite.log 
+
+    # standard MKWS account
     RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
 
+    # jasmine test account
+    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
     # The following rule allows the server to accept service-proxy
     # requests that begin with an escaped "%3F" rather than a literal
     # "?". This is useful, as requests generated by ProxyPass
diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index 8625691..2b20e37 100644 (file)
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -25,8 +25,12 @@
         SetOutputFilter DEFLATE 
     </Location> 
 
+    # standard MKWS account
     RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
 
+    # jasmine test account
+    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
     ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
     ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
 
MasterKey Widget Set