X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2Fapache2%2Fspclient-live;h=6bbd3d16a9bdb65cd94502125c4245d18c161235;hb=fe1f80f6dae782c5e362a9f0ddd4d5e58584c661;hp=1bd022a5c37f7a9ce9690cde6b2010e38e2917c9;hpb=2952f66ef5412120da277f030d588af4f0e6528e;p=mkws-moved-to-github.git

diff --git a/etc/apache2/spclient-live b/etc/apache2/spclient-live
index 1bd022a..6bbd3d1 100644
--- a/etc/apache2/spclient-live
+++ b/etc/apache2/spclient-live
@@ -1,6 +1,15 @@
 # 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
 
@@ -14,32 +23,32 @@
     RewriteEngine on
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-    RewriteRule /service-proxy/auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
 
-    Header set Access-Control-Allow-Origin "http://somesite.indexdata.com"
+# We want *, but can't use credentials unless we specify a particular origin
+# Instead, we generate the header using mod_perl: see below.
+#    Header set Access-Control-Allow-Origin "http://somesite.indexdata.com"
+#    Header set Access-Control-Allow-Origin "*"
     Header set Access-Control-Allow-Credentials true
 
     # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName somesite.indexdata.com
-
-    ErrorLog /var/log/apache2/somesite-error.log
-    CustomLog /var/log/apache2/somesite-access.log combined
-
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-somesite.html
-
-#    RewriteEngine on
-#    RewriteLogLevel 1
-#    RewriteLog /var/log/apache2/mkws-rewrite.log 
-#    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-#
-#    # For MKC Service Proxy
-#    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-#    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+
+    # Although what follows works perfectly well, it's no use to us:
+    # IE8/9 are unable to set or read ANY headers when operating in
+    # CORS mode.
+    #
+    #    PerlOptions +Parent
+    #    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    #    <Location /service-proxy/>
+    #        PerlInputFilterHandler MyApache2::CopyCookie
+    #        PerlOutputFilterHandler MyApache2::CopyCookie
+    #    </Location>
+
+    PerlOptions +Parent
+    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    <Location /service-proxy/>
+        PerlOutputFilterHandler MyApache2::SetACAO
+    </Location>
 </VirtualHost>