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

diff --git a/examples/apache2/example-dev-ssl-px b/examples/apache2/example-dev-ssl-px
new file mode 100644 (file)
index 0000000..04106db
--- /dev/null
+++ b/examples/apache2/example-dev-ssl-px
@@ -0,0 +1,48 @@
+# A very simple configuration to proxy the irspy
+
+<VirtualHost *:443>
+    ServerName example.indexdata.com 
+    ServerAlias example-dev.indexdata.com
+
+  <IfModule mod_ssl.c>
+    SSLEngine on
+    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+
+    #SSLCertificateFile /etc/ssl/certs/indexdata.com/id.cert
+    #SSLCertificateKeyFile /etc/ssl/certs/indexdata.com/id.key
+
+    SSLProxyEngine on
+  </IfModule>
+
+    # Remove the X-Forwarded-For header, as the proxy appends to it,
+    # and we need a clean ip address for the statistics
+    # RequestHeader unset X-Forwarded-For early
+    # Never mind
+
+    # ProxyRequests off
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+
+    ProxyPreserveHost On
+    ProxyPass         / http://dart/
+    ProxyPassReverse  / http://dart/
+
+    # Experiments to hunt down bu 3716
+    # Increase buffer size so that we don't go for chunked stuff
+    # ProxyIOBufferSize 8192
+    # Didn't help
+    # Disable gzipping
+    # RequestHeader unset Accept-Encoding
+    # Didn't help 
+    # ProxyReceiveBufferSize 8192
+    # Didn't help 
+    SetEnv force-proxy-request-1.0 1
+    SetEnv proxy-nokeepalive 1
+
+    # These are the logs for the proxying operation
+    ErrorLog     /var/log/apache2/example-dev-ssl-error.log
+    CustomLog    /var/log/apache2/example-dev-ssl-access.log combined
+</VirtualHost>
+

diff --git a/examples/apache2/example-ssl-px b/examples/apache2/example-ssl-px
new file mode 100644 (file)
index 0000000..159b28b
--- /dev/null
+++ b/examples/apache2/example-ssl-px
@@ -0,0 +1,48 @@
+# A very simple configuration to proxy the irspy
+
+<VirtualHost *:443>
+    ServerName example.indexdata.com 
+    ServerAlias example-dev.indexdata.com
+
+  <IfModule mod_ssl.c>
+    SSLEngine on
+    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+
+    #SSLCertificateFile /etc/ssl/certs/indexdata.com/id.cert
+    #SSLCertificateKeyFile /etc/ssl/certs/indexdata.com/id.key
+
+    SSLProxyEngine on
+  </IfModule>
+
+    # Remove the X-Forwarded-For header, as the proxy appends to it,
+    # and we need a clean ip address for the statistics
+    # RequestHeader unset X-Forwarded-For early
+    # Never mind
+
+    # ProxyRequests off
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+
+    ProxyPreserveHost On
+    ProxyPass         / http://caliban/
+    ProxyPassReverse  / http://caliban/
+
+    # Experiments to hunt down bu 3716
+    # Increase buffer size so that we don't go for chunked stuff
+    # ProxyIOBufferSize 8192
+    # Didn't help
+    # Disable gzipping
+    # RequestHeader unset Accept-Encoding
+    # Didn't help 
+    # ProxyReceiveBufferSize 8192
+    # Didn't help 
+    SetEnv force-proxy-request-1.0 1
+    SetEnv proxy-nokeepalive 1
+
+    # These are the logs for the proxying operation
+    ErrorLog     /var/log/apache2/example-ssl-error.log
+    CustomLog    /var/log/apache2/example-ssl-access.log combined
+</VirtualHost>
+

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index e78f4d4..2a4c6f4 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -5,13 +5,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Mike's playground</title>
     <link rel="stylesheet" type="text/css" href="http://x.mkws.indexdata.com/mkws.css" />
-    <script type="text/javascript">
-      var mkws_config = {
-        service_proxy_auth: "http://x.example.indexdata.com/service-proxy-auth/",
-      };
-      // See also the Apache2 RewriteRule needed to make this work:
-      // http://example.indexdata.com/apache-config.txt
-    </script>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="http://x.mkws.indexdata.com/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="http://x.mkws.indexdata.com/handlebars-v1.1.2.js"></script>