From: Jason Skomorowski Date: Fri, 16 Jan 2015 17:36:06 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=81cc6aa53ca1174f3592c0a0d83569406d29f4f8;hp=79ba978af9f202afa1c181b0675401b92447f579 Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws --- diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike index 3f3885a..586b089 100644 --- a/examples/apache2/mkws-examples-mike +++ b/examples/apache2/mkws-examples-mike @@ -1,11 +1,14 @@ ServerName x.example.indexdata.com - DocumentRoot /home/mike/git/work/mkws/examples/htdocs/ + DocumentRoot /home/mike/git/work/demos/ Alias /tools/htdocs/ /home/mike/git/work/mkws/tools/htdocs/ Alias /src/ /home/mike/git/work/mkws/src/ Alias /jasmine/ /home/mike/git/work/mkws/examples/jasmine/ Alias /test/ /home/mike/git/work/mkws/test/ + Alias /mkws-sandbox/ /home/mike/git/work/mkws/examples/htdocs/ + Alias /metarepo/ /home/mike/git/work/metarepo/htdocs/ + Allow from all Require all granted diff --git a/examples/apache2/mkws-examples-mike-mac b/examples/apache2/mkws-examples-mike-mac index 1f0ae6d..038c29d 100644 --- a/examples/apache2/mkws-examples-mike-mac +++ b/examples/apache2/mkws-examples-mike-mac @@ -7,14 +7,10 @@ Alias /test/ /Users/mike/git/work/mkws/test/ - Allow from all + #Allow from all <-- This is for Apache v2.4, but for v4.4 we need ... + Require all granted ErrorLog /var/log/apache2/mkws-examples-error.log CustomLog /var/log/apache2/mkws-examples-access.log combined - - RewriteEngine on - RewriteRule /service-proxy-auth/ http://sp-mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] - #RewriteLog /var/log/apache2/mkws-examples-rewrite.log - #RewriteLogLevel 9 diff --git a/examples/htdocs/heikki-motd.html b/examples/htdocs/heikki-motd.html index ee0461e..8608bc9 100644 --- a/examples/htdocs/heikki-motd.html +++ b/examples/htdocs/heikki-motd.html @@ -11,12 +11,12 @@ //sort_default: "title:1", }; - - - - - - + + + + + +