Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/examples/htdocs/index.html b/examples/htdocs/index.html
index e58c1de..981d83c 100644 (file)
--- a/examples/htdocs/index.html
+++ b/examples/htdocs/index.html
@@ -12,5 +12,6 @@
     <div class="mkwsResults"></div>
     <div class="mkwsTargets"></div>
     <div class="mkwsStat"></div>
+    <div class="mkwsBuilder"></div>
   </body>
 </html>

diff --git a/tools/apache2/mkws-ne b/tools/apache2/mkws-ne
new file mode 100644 (file)
index 0000000..c0ade2a
--- /dev/null
+++ b/tools/apache2/mkws-ne
@@ -0,0 +1,45 @@
+# Configuration for the apache web server                 -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName mkws-ne
+    ServerAlias mkws-ne
+
+    ServerAdmin webmaster@indexdata.com
+    ErrorLog /var/log/apache2/mkws-dev-error.log
+    CustomLog /var/log/apache2/mkws-dev-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/mkws-dev-rewrite.log
+
+    DocumentRoot /indexdata/gitprojects/mkws/examples/htdocs
+    #Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+    #Alias /src /home/indexdata/mkws-dev/src
+    #Alias /test /home/indexdata/mkws-dev/test
+    #Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
+
+    # CORS setting
+    #Header set Access-Control-Allow-Credentials true
+    #Headers set Access-Control-Allow-Origin "*"
+
+    # compress text output
+    <Location />
+        AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
+        SetOutputFilter DEFLATE
+    </Location>
+
+    # jasmine test account
+    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
+    # mkws devel account (e.g. memached testing)
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
+
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    ProxyPass        /pazpar2/         http://mk2-test.indexdata.com/test-pazpar2/
+    ProxyPassReverse /pazpar2/         http://mk2-test.indexdata.com/test-pazpar2/
+
+</VirtualHost>
+