X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-mike-mac;h=21192c59472aa35dbb538cc6cb235062f5031864;hp=c6ade11e65ba900877eb2727f8c2f22b44c1a64c;hb=d9392af31cad0e75d09f5dda9c82a30e6ce4476f;hpb=b6a4114b245ffe3643d5f7aa580012f4a5227715 diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac index c6ade11..21192c5 100644 --- a/tools/apache2/mkws-mike-mac +++ b/tools/apache2/mkws-mike-mac @@ -3,17 +3,12 @@ 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://sp-mkc.indexdata.com/service-proxy/ @@ -21,19 +16,6 @@ # 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 - - # Needed on Mac, which locks Apache down hard by default. - - Allow from all + Require all granted