Simplify configuration

[mkws-moved-to-github.git] / etc / apache2 / spclient-live

diff --git a/etc/apache2/spclient-live b/etc/apache2/spclient-live
index dfffffd..dfa7ed4 100644 (file)
--- 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,31 +23,17 @@
     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]
-
-    Header set Access-Control-Allow-Origin "http://somesite.indexdata.com"
-
-    # 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
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
 
-    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]
+    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/
+    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+
+    PerlOptions +Parent
+    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    <Location /service-proxy>
+        PerlOutputFilterHandler MyApache2::SetACAO
+    </Location>
 </VirtualHost>