X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fapache2%2Fmkws-mike-mac;h=21192c59472aa35dbb538cc6cb235062f5031864;hb=72d46e97e6b3f4f0528ac5c519c0ff565baae7d4;hp=832d2a00ee6135d7bc95201887563a9630a01758;hpb=4edd95f6207edcd7c121ea2dc1dcc1a6132c8732;p=mkws-moved-to-github.git
diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac
index 832d2a0..21192c5 100644
--- a/tools/apache2/mkws-mike-mac
+++ b/tools/apache2/mkws-mike-mac
@@ -3,41 +3,19 @@
ServerName x.mkws.indexdata.com
- ErrorLog /opt/local/apache2/logs/mkws-error.log
- CustomLog /opt/local/apache2/logs/mkws-access.log combined
+ ErrorLog /var/log/apache2/mkws-error.log
+ CustomLog /var/log/apache2/mkws-access.log combined
- 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
- RewriteLog /opt/local/apache2/logs/spclient-rewrite.log
- RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+ DocumentRoot /Users/mike/git/work/mkws/tools/htdocs
+ Alias /libjs-pz2/ /Users/mike/git/work/libjs-pz2/
+ Alias /pazpar2/ /Users/mike/git/work/pazpar2/
# For MKC Service Proxy
- ProxyPass /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
- ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/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/
+ 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
+ Require all granted