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
index 8d4a91b..460e154 100644 (file)
--- a/examples/apache2/mkws-examples
+++ b/examples/apache2/mkws-examples
@@ -8,4 +8,6 @@
 
     RewriteEngine on
     RewriteRule /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo [P]
+    #RewriteLog /var/log/apache2/mkws-examples-rewrite.log
+    #RewriteLogLevel 9
 </VirtualHost>

diff --git a/examples/htdocs/localauth.html b/examples/htdocs/localauth.html
index 1eac271..867d6ea 100644 (file)
--- a/examples/htdocs/localauth.html
+++ b/examples/htdocs/localauth.html
@@ -9,6 +9,8 @@
         service_proxy_auth: "http://example.indexdata.com/service-proxy-auth/",
         service_proxy_auth_domain : "mkws.indexdata.com"
       };
+      // See also the Apache2 RewriteRule needed to make this work:
+      // http://example.indexdata.com/apache-config.txt
     </script>
     <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
   </head>