projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 2a37d20)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 23 Jan 2014 12:28:33 +0000 (12:28 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 23 Jan 2014 12:28:33 +0000 (12:28 +0000)
examples/htdocs/jasmine-local-popup.html patch | blob | history
tools/apache2/mkws-dev patch | blob | history
tools/apache2/mkws-test [new file with mode: 0644] patch | blob

diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 1ac6aa7..bca4705 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -28,7 +28,8 @@
 
   <body>
     <script type="text/javascript">
-    var mkws_config = { show_lang: true,
+    var mkws_config = {
+      perpage_default: 10,
       pazpar2_url:          "/service-proxy/",
       service_proxy_auth:   "/service-proxy-auth"
     };
diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 7dde2aa..d3d195f 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -2,9 +2,9 @@
 
 # pazpar2 / service proxy config
 <VirtualHost *:80>
-    ServerName spclient.example.com
-    ServerAlias spclient-dev.indexdata.com mkws-dev.indexdata.com
-    ServerAdmin webmaster@example.com
+    ServerName mkws-dev.indexdata.com
+    ServerAlias mkws-dev
+    ServerAdmin webmaster@indexdata.com
     ErrorLog /var/log/apache2/mkws-dev-error.log
     CustomLog /var/log/apache2/mkws-dev-access.log combined
 
@@ -12,8 +12,8 @@
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-dev-rewrite.log 
 
-    DocumentRoot /home/indexdata/mkws/examples/htdocs
-    Alias /tools/htdocs /home/indexdata/mkws/tools/htdocs
+    DocumentRoot /home/indexdata/mkws-dev/examples/htdocs
+    Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
 
     # compress text output
     <Location />
diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
new file mode 100644 (file)
index 0000000..2114884
--- /dev/null
+++ b/tools/apache2/mkws-test
@@ -0,0 +1,33 @@
+# Configuration for the apache web server                 -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName mkws-test.indexdata.com
+    ServerAlias mkws-test spclient-dev.indexdata.com
+    ServerAdmin webmaster@indexdata.com
+    ErrorLog /var/log/apache2/mkws-test-error.log
+    CustomLog /var/log/apache2/mkws-test-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/mkws-test-rewrite.log 
+
+    DocumentRoot /home/indexdata/mkws-test/examples/htdocs
+    Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+
+    # compress text output
+    <Location />
+        AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
+        SetOutputFilter DEFLATE 
+    </Location> 
+
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [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://localhost:8004/pazpar2/
+    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
+
+</VirtualHost>
+
MasterKey Widget Set