X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-mike-mac;h=d781dcb8c21c1669848591aa6ef8e555c618de2c;hb=9ccf24cb638639c7bac46ab3ecdc86cda94dbfcb;hp=c416caec4f863ce99de24fcc52bfc0b9278e0a7c;hpb=4034d96a134331b082c863f969c191c2c24cd445;p=mkws-moved-to-github.git
diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac
index c416cae..d781dcb 100644
--- a/tools/apache2/mkws-mike-mac
+++ b/tools/apache2/mkws-mike-mac
@@ -8,6 +8,7 @@
DocumentRoot /usr/local/src/git/mkws/tools/htdocs
Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
+ Alias /pazpar2/ /usr/local/src/git/pazpar2/
RewriteEngine on
RewriteLogLevel 1
@@ -15,8 +16,25 @@
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.
+
+ Allow from all
+
+
+
+
+ ServerName x.example.indexdata.com
+ ErrorLog /opt/local/apache2/logs/example-error.log
+ CustomLog /opt/local/apache2/logs/example-access.log combined
+
+ DocumentRoot /usr/local/src/git/mkws/examples/htdocs
+ Alias /tools/htdocs/ /usr/local/src/git/mkws/tools/htdocs/
+ Alias /src/ /usr/local/src/git/mkws/src/
+ Alias /jasmine/ /usr/local/src/git/mkws/examples/jasmine/
+ Alias /test/ /usr/local/src/git/mkws/test/
# Needed on Mac, which locks Apache down hard by default.