X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-dev;h=369dcf9fddd230e4e7f76c382d5ead6b6a7093ef;hp=c9f27117e46ab80c7e9a6547f0af8314013dc7b7;hb=d7f1128baeef8abab168cf28d937ea5583b99fc6;hpb=ed23b95e3c058265c9328e039ac1b49e5eac79c7

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index c9f2711..369dcf9 100644
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -3,8 +3,9 @@
 # pazpar2 / service proxy config
 <VirtualHost *:80>
     ServerName mkws-dev.indexdata.com
-    ServerAlias mkws-dev
-    ServerAdmin webmaster@example.com
+    ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com
+
+    ServerAdmin webmaster@indexdata.com
     ErrorLog /var/log/apache2/mkws-dev-error.log
     CustomLog /var/log/apache2/mkws-dev-access.log combined
 
@@ -12,8 +13,19 @@
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-dev-rewrite.log 
 
-    DocumentRoot /home/indexdata/mkws/examples/htdocs
-    Alias /tools/htdocs /home/indexdata/mkws/tools/htdocs
+    DocumentRoot /home/indexdata/mkws-dev/examples/htdocs
+    Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+    Alias /src /home/indexdata/mkws-dev/src
+    Alias /test /home/indexdata/mkws-dev/test
+    Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
+
+    Alias /demos/src /home/indexdata/mkws-dev/src
+    Alias /demos/tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+    Alias /demos /home/indexdata/demos
+
+    # CORS setting
+    Header set Access-Control-Allow-Credentials true
+    Header set Access-Control-Allow-Origin "*"
 
     # compress text output
     <Location />
@@ -21,10 +33,14 @@
         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(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
+    # 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://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/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/