projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c81847
)
changed SP host from 'mkc.indexdata.com:9009' to 'sp-mkc.indexdata.com' which points...
author
John Malconian
<malc@indexdata.com>
Mon, 28 Apr 2014 17:52:17 +0000
(17:52 +0000)
committer
John Malconian
<malc@indexdata.com>
Mon, 28 Apr 2014 17:52:17 +0000
(17:52 +0000)
tools/apache2/jasmine-dev.template
patch
|
blob
|
history
tools/apache2/mkws-dev
patch
|
blob
|
history
tools/apache2/mkws-heikki
patch
|
blob
|
history
tools/apache2/mkws-live
patch
|
blob
|
history
tools/apache2/mkws-mike-mac
patch
|
blob
|
history
tools/apache2/mkws-ne
patch
|
blob
|
history
tools/apache2/mkws-test
patch
|
blob
|
history
diff --git
a/tools/apache2/jasmine-dev.template
b/tools/apache2/jasmine-dev.template
index
5486688
..
a2aac5a
100644
(file)
--- a/
tools/apache2/jasmine-dev.template
+++ b/
tools/apache2/jasmine-dev.template
@@
-63,8
+63,8
@@
Include /etc/apache2/mods-available/deflate.conf
# mkws devel account (e.g. memached testing)
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [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/
+ 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/
diff --git
a/tools/apache2/mkws-dev
b/tools/apache2/mkws-dev
index
17a2141
..
9805492
100644
(file)
--- a/
tools/apache2/mkws-dev
+++ b/
tools/apache2/mkws-dev
@@
-35,8
+35,8
@@
# mkws devel account (e.g. memached testing)
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [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/
+ 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/
diff --git
a/tools/apache2/mkws-heikki
b/tools/apache2/mkws-heikki
index
1c4b524
..
9206f3b
100644
(file)
--- a/
tools/apache2/mkws-heikki
+++ b/
tools/apache2/mkws-heikki
@@
-35,8
+35,8
@@
RewriteRule /service-proxy-auth/ /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
# For MKC Service Proxy
RewriteRule /service-proxy-auth/ /service-proxy/?command=auth&action=login&username=demo&password=demo [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://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/
diff --git
a/tools/apache2/mkws-live
b/tools/apache2/mkws-live
index
d6f6d07
..
0b48898
100644
(file)
--- a/
tools/apache2/mkws-live
+++ b/
tools/apache2/mkws-live
@@
-30,8
+30,8
@@
Header set Access-Control-Allow-Credentials true
# For MKC Service Proxy
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://sp-mkc.indexdata.com/service-proxy/
+ ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
PerlOptions +Parent
PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
PerlOptions +Parent
PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
diff --git
a/tools/apache2/mkws-mike-mac
b/tools/apache2/mkws-mike-mac
index
832d2a0
..
d781dcb
100644
(file)
--- a/
tools/apache2/mkws-mike-mac
+++ b/
tools/apache2/mkws-mike-mac
@@
-16,8
+16,8
@@
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
# For MKC Service Proxy
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://sp-mkc.indexdata.com/service-proxy/
+ ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
# Needed on Mac, which locks Apache down hard by default.
<Directory />
# Needed on Mac, which locks Apache down hard by default.
<Directory />
diff --git
a/tools/apache2/mkws-ne
b/tools/apache2/mkws-ne
index
6677340
..
6b613fd
100644
(file)
--- a/
tools/apache2/mkws-ne
+++ b/
tools/apache2/mkws-ne
@@
-35,8
+35,8
@@
# mkws devel account (e.g. memached testing)
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [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/
+ ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+ ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
ProxyPass /pazpar2/ http://mk2-test.indexdata.com/test-pazpar2/
ProxyPassReverse /pazpar2/ http://mk2-test.indexdata.com/test-pazpar2/
ProxyPass /pazpar2/ http://mk2-test.indexdata.com/test-pazpar2/
ProxyPassReverse /pazpar2/ http://mk2-test.indexdata.com/test-pazpar2/
diff --git
a/tools/apache2/mkws-test
b/tools/apache2/mkws-test
index
507b162
..
495b6b7
100644
(file)
--- a/
tools/apache2/mkws-test
+++ b/
tools/apache2/mkws-test
@@
-35,8
+35,8
@@
# jasmine test account
RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
# jasmine test account
RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [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-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/