From: Mike Taylor Date: Tue, 8 Apr 2014 10:55:38 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws X-Git-Tag: 1.0.0~990 X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=4fe180e85171e520a37c3a78c60bf4a0343996f4;hp=f47f043218c969f5a5dd8f17203a6ea0c2e3f822;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws --- diff --git a/tools/apache2/mkws-heikki b/tools/apache2/mkws-heikki index 111b35b..1c4b524 100644 --- a/tools/apache2/mkws-heikki +++ b/tools/apache2/mkws-heikki @@ -18,6 +18,9 @@ DocumentRoot /home/heikki/proj/mkws/examples/htdocs Alias /tools/htdocs /home/heikki/proj/mkws/tools/htdocs + Alias /src /home/heikki/proj/mkws/src + Alias /test /home/heikki/proj/mkws/test + Alias /jasmine /home/heikki/proj/mkws/examples/jasmine # allow cors Header set Access-Control-Allow-Credentials true diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test index 2b20e37..507b162 100644 --- a/tools/apache2/mkws-test +++ b/tools/apache2/mkws-test @@ -14,6 +14,10 @@ DocumentRoot /home/indexdata/mkws-test/examples/htdocs Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs + Alias /src /home/indexdata/mkws-test/src + Alias /test /home/indexdata/mkws-test/test + Alias /jasmine /home/indexdata/mkws-test/examples/jasmine + # CORS setting Header set Access-Control-Allow-Credentials true