X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-dev;h=36c99b94f850409d69c4cc1714b0daf9b2b1bc6c;hb=500b69a733512550e5d6a938196ce5dd6ded27cc;hp=d059e7fcdf37f3ea316ae1666886701c0832f551;hpb=93563d16b22e19e55b987c32aec1bf2e4d0b8969;p=mkws-moved-to-github.git

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index d059e7f..36c99b9 100644
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -3,7 +3,8 @@
 # pazpar2 / service proxy config
 <VirtualHost *:80>
     ServerName mkws-dev.indexdata.com
-    ServerAlias mkws-dev
+    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
@@ -17,7 +18,7 @@
 
     # CORS setting
     Header set Access-Control-Allow-Credentials true
-    Header set Access-Control-Allow-Origin *
+    Header set Access-Control-Allow-Origin "*"
 
     # compress text output
     <Location />
@@ -25,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/