projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The service proxy auth URL shortcut may contain ;jsessionid= as part of the URL path...
[mkws-moved-to-github.git]
/
tools
/
apache2
/
mkws-test
diff --git
a/tools/apache2/mkws-test
b/tools/apache2/mkws-test
index
2b20e37
..
f71972a
100644
(file)
--- a/
tools/apache2/mkws-test
+++ b/
tools/apache2/mkws-test
@@
-14,6
+14,10
@@
DocumentRoot /home/indexdata/mkws-test/examples/htdocs
Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs
DocumentRoot /home/indexdata/mkws-test/examples/htdocs
Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+ Alias /src /home/indexdata/mkws-test/src
+ Alias /test /home/indexdata/mkws-test/test
+ Alias /jasmine /home/indexdata/mkws-test/examples/jasmine
+
# CORS setting
Header set Access-Control-Allow-Credentials true
# CORS setting
Header set Access-Control-Allow-Credentials true
@@
-26,13
+30,13
@@
</Location>
# standard MKWS account
</Location>
# standard MKWS account
- RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
+ RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkws&password=mkws [P]
# jasmine test account
# jasmine test account
- RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+ RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [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-mkc.indexdata.com/service-proxy/
+ ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
ProxyPass /pazpar2/ http://localhost:8004/pazpar2/
ProxyPassReverse /pazpar2/ http://localhost:8004/pazpar2/
ProxyPass /pazpar2/ http://localhost:8004/pazpar2/
ProxyPassReverse /pazpar2/ http://localhost:8004/pazpar2/