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
new document root config
[mkws-moved-to-github.git]
/
tools
/
apache2
/
mkws-dev
diff --git
a/tools/apache2/mkws-dev
b/tools/apache2/mkws-dev
index
a24e944
..
d3d195f
100644
(file)
--- a/
tools/apache2/mkws-dev
+++ b/
tools/apache2/mkws-dev
@@
-2,9
+2,9
@@
# pazpar2 / service proxy config
<VirtualHost *:80>
# pazpar2 / service proxy config
<VirtualHost *:80>
- ServerName spclient.example.com
- ServerAlias spclient-dev.indexdata.com mkws-dev.indexdata.com
- ServerAdmin webmaster@example.com
+ ServerName mkws-dev.indexdata.com
+ ServerAlias mkws-dev
+ ServerAdmin webmaster@indexdata.com
ErrorLog /var/log/apache2/mkws-dev-error.log
CustomLog /var/log/apache2/mkws-dev-access.log combined
ErrorLog /var/log/apache2/mkws-dev-error.log
CustomLog /var/log/apache2/mkws-dev-access.log combined
@@
-12,7
+12,8
@@
RewriteLogLevel 1
RewriteLog /var/log/apache2/mkws-dev-rewrite.log
RewriteLogLevel 1
RewriteLog /var/log/apache2/mkws-dev-rewrite.log
- DocumentRoot /home/indexdata/mkws/examples/htdocs
+ DocumentRoot /home/indexdata/mkws-dev/examples/htdocs
+ Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
# compress text output
<Location />
# compress text output
<Location />
@@
-20,7
+21,7
@@
SetOutputFilter DEFLATE
</Location>
SetOutputFilter DEFLATE
</Location>
- 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=mkws&password=mkws [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://mkc.indexdata.com:9009/service-proxy/
ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/