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
Local SP config not needed
[mkws-moved-to-github.git]
/
etc
/
apache2
/
spclient-mike
diff --git
a/etc/apache2/spclient-mike
b/etc/apache2/spclient-mike
index
008d639
..
44efb2b
100644
(file)
--- a/
etc/apache2/spclient-mike
+++ b/
etc/apache2/spclient-mike
@@
-1,21
+1,18
@@
-# Configuration for the apache web server -*- apache -*-
+# Configuration for the apache web server
# Running on Mike's local development box
# Running on Mike's local development box
-# This file is a variant of "spdemo"
-# pazpar2 / service proxy config
<VirtualHost *:80>
ServerName x.spclient.indexdata.com
ErrorLog /var/log/apache2/spclient-error.log
CustomLog /var/log/apache2/spclient-access.log combined
<VirtualHost *:80>
ServerName x.spclient.indexdata.com
ErrorLog /var/log/apache2/spclient-error.log
CustomLog /var/log/apache2/spclient-access.log combined
+ DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
+ Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
+
RewriteEngine on
RewriteLogLevel 1
RewriteLog /var/log/apache2/spclient-rewrite.log
RewriteEngine on
RewriteLogLevel 1
RewriteLog /var/log/apache2/spclient-rewrite.log
-
- DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
- Alias /pz2.js /usr/local/src/git/pazpar2/js/pz2.js
-
- 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=guest&password=guest [P] # [NE,P]
# For MKC Service Proxy
ProxyPass /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
# For MKC Service Proxy
ProxyPass /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
@@
-24,4
+21,9
@@
# For local Service Proxy running as mvn jetty:run
#ProxyPass /service-proxy/ http://localhost:8585/service-proxy/
#ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
# For local Service Proxy running as mvn jetty:run
#ProxyPass /service-proxy/ http://localhost:8585/service-proxy/
#ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
+
+ # Needed on Mac, which locks Apache down hard by default.
+ <Directory />
+ Allow from all
+ </Directory>
</VirtualHost>
</VirtualHost>