You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/10/30 16:43:37 UTC
svn commit: r590121 - in /lenya/trunk: ./
src/modules-core/linking/config/cocoon-xconf/ src/pubs/default/config/
tools/proxytest/
Author: nettings
Date: Tue Oct 30 08:43:36 2007
New Revision: 590121
URL: http://svn.apache.org/viewvc?rev=590121&view=rev
Log:
added proxy test environment. no functional changes, everything is
inactive by default. needs docs (see header of jetty6.xml for a rough
outline), and proxy settings are somewhat broken atm...
Added:
lenya/trunk/tools/proxytest/
lenya/trunk/tools/proxytest/apache_vhosts.conf
lenya/trunk/tools/proxytest/hosts_fake
lenya/trunk/tools/proxytest/jetty6.xml
- copied, changed from r590068, lenya/trunk/jetty6+ajp.xml
lenya/trunk/tools/proxytest/proxy-ssl-cert.pem
lenya/trunk/tools/proxytest/proxy-ssl-key.pem
Removed:
lenya/trunk/jetty6+ajp.xml
Modified:
lenya/trunk/src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf
lenya/trunk/src/pubs/default/config/publication.xml
Modified: lenya/trunk/src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf?rev=590121&r1=590120&r2=590121&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf (original)
+++ lenya/trunk/src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf Tue Oct 30 08:43:36 2007
@@ -31,10 +31,10 @@
<component logger="lenya.proxy"
role="org.apache.lenya.cms.linking.GlobalProxies"
class="org.apache.lenya.cms.linking.impl.GlobalProxiesImpl">
- <!--
+<!--
<proxy ssl="false" url="http://www.example.com/lenya"/>
<proxy ssl="true" url="https://www.example.com/lenya"/>
- -->
+-->
</component>
</xconf>
Modified: lenya/trunk/src/pubs/default/config/publication.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/publication.xml?rev=590121&r1=590120&r2=590121&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/config/publication.xml (original)
+++ lenya/trunk/src/pubs/default/config/publication.xml Tue Oct 30 08:43:36 2007
@@ -126,12 +126,12 @@
-->
<proxies>
- <!--
+<!--
<proxy area="live" ssl="true" url="https://www.example.com/lenya/customer"/>
- <proxy area="live" ssl="false" url="http://customer..example.com"/>
+ <proxy area="live" ssl="false" url="http://customer.example.com"/>
<proxy area="authoring" ssl="true" url="https://www.example.com/lenya/customer"/>
<proxy area="authoring" ssl="false" url="http://www.example.com/lenya/customer"/>
- -->
+-->
</proxies>
</publication>
Added: lenya/trunk/tools/proxytest/apache_vhosts.conf
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/proxytest/apache_vhosts.conf?rev=590121&view=auto
==============================================================================
--- lenya/trunk/tools/proxytest/apache_vhosts.conf (added)
+++ lenya/trunk/tools/proxytest/apache_vhosts.conf Tue Oct 30 08:43:36 2007
@@ -0,0 +1,100 @@
+# Lenya proxy testing environment for Apache HTTPD 2.2.x
+
+NameVirtualHost 127.0.0.1:80
+
+LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
+LoadModule proxy_module /usr/lib/apache2/mod_proxy.so
+LoadModule proxy_ajp_module /usr/lib/apache2/mod_proxy_ajp.so
+
+
+<VirtualHost www.example.com:80>
+
+ ServerAdmin lenyatest@www.example.com
+ ServerAlias www.example.com www
+ DocumentRoot /srv/www/htdocs
+
+ HostnameLookups Off
+ UseCanonicalName Off
+ ServerSignature On
+
+ RewriteEngine On
+ ProxyRequests Off
+
+ # force SSL protection for authoring:
+ RewriteRule ^/lenya/(.*)/authoring/(.*) https://www.example.com/lenya/$1/authoring/$2
+ # this is the proxy for global resources:
+ RewriteRule ^/lenya/(.*) ajp://localhost:8009/webapp/$1 [P]
+ ProxyPassReverse /lenya/ ajp://localhost:8009/webapp/
+
+ ErrorLog /tmp/LenyaTest_www.example.com-errors
+ CustomLog /tmp/LenyaTest_www.example.com-access combined
+ RewriteLogLevel 4
+ RewriteLog /tmp/LenyaTest_www.example.com-rewrite.log
+
+</VirtualHost>
+
+
+<IfDefine SSL>
+<IfDefine !NOSSL>
+<VirtualHost www.example.com:443>
+
+ SSLEngine on
+ SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+ SSLCertificateFile /tmp/proxy-ssl-cert.pem
+ SSLCertificateKeyFile /tmp/proxy-ssl-key.pem
+
+ ServerAdmin lenyatest@www.example.com
+ ServerAlias www.example.com www
+ DocumentRoot /srv/www/htdocs
+
+ HostnameLookups Off
+ UseCanonicalName Off
+ ServerSignature On
+
+ RewriteEngine On
+ ProxyRequests Off
+
+ # requests to /lenya are handled by jetty
+ # (that means you can use all other paths, including "/" for
+ # other purposes.
+ RewriteRule ^/lenya/(.*) ajp://localhost:8009/webapp/$1 [P]
+ ProxyPassReverse /lenya/ ajp://localhost:8009/webapp/
+
+ ErrorLog /tmp/LenyaTest_www.example.com-SSL-errors
+ CustomLog /tmp/LenyaTest_www.example.com-SSL-access combined
+ RewriteLogLevel 4
+ RewriteLog /tmp/LenyaTest_www.example.com-SSL-rewrite.log
+
+</VirtualHost>
+</IfDefine>
+</IfDefine>
+
+
+<VirtualHost customer.example.com:80>
+
+ ServerAdmin webmaster@customer.example.com
+ ServerAlias customer.example.com customer
+ DocumentRoot /srv/www/htdocs
+
+ HostnameLookups Off
+ UseCanonicalName Off
+ ServerSignature On
+
+ RewriteEngine On
+ ProxyRequests Off
+
+ # catch funky addresses with "/"s and "."s to make
+ # cocoon matching behave like apache (where "foo/" and "foo" and "/./foo" all do the same):
+ # FIXME: could use some review and better documentation. Does this have security implications as well?
+ RewriteRule ^/([^/\.]+)$ $1/ [R]
+ # all requests to customer.example.com are passed to the live area:
+ RewriteRule ^/(.*) ajp://localhost:8009/webapp/default/live/$1 [P,L]
+ ProxyPassReverse / ajp://localhost:8009/webapp/default/live
+
+ ErrorLog /tmp/LenyaTest_customer.example.com-errors
+ CustomLog /tmp/LenyaTest_customer.example.com-access combined
+ RewriteLogLevel 4
+ RewriteLog /tmp/LenyaTest_customer.example.com-rewrite.log
+
+</VirtualHost>
+
Added: lenya/trunk/tools/proxytest/hosts_fake
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/proxytest/hosts_fake?rev=590121&view=auto
==============================================================================
--- lenya/trunk/tools/proxytest/hosts_fake (added)
+++ lenya/trunk/tools/proxytest/hosts_fake Tue Oct 30 08:43:36 2007
@@ -0,0 +1,2 @@
+127.0.0.1 www.example.com www
+127.0.0.1 customer.example.com customer
Copied: lenya/trunk/tools/proxytest/jetty6.xml (from r590068, lenya/trunk/jetty6+ajp.xml)
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/proxytest/jetty6.xml?p2=lenya/trunk/tools/proxytest/jetty6.xml&p1=lenya/trunk/jetty6%2Bajp.xml&r1=590068&r2=590121&rev=590121&view=diff
==============================================================================
--- lenya/trunk/jetty6+ajp.xml (original)
+++ lenya/trunk/tools/proxytest/jetty6.xml Tue Oct 30 08:43:36 2007
@@ -19,8 +19,14 @@
$LENYA_HOME:> cd tools/jetty-6.1.6
$LENYA_HOME:> java -Djava.endorsed.dirs="../../externals/cocoon_2_1_x/lib/endorsed/" \
- -jar start.jar ../../jetty6+ajp.xml
-
+ -jar start.jar ../proxytest/jetty6.xml
+
+ The Lenya webapp is now available at http://localhost:8888/webapp/.
+ There are jetty example webapps and some Leny garbarge in the root context which
+ should be fixable by being more specific under "webapp deployer" below, but it's quite
+ desirable to have Lenya in a non-root context for testing, to make sure we always use
+ correct paths and don't wrongly assume "/".
+
-->
Added: lenya/trunk/tools/proxytest/proxy-ssl-cert.pem
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/proxytest/proxy-ssl-cert.pem?rev=590121&view=auto
==============================================================================
--- lenya/trunk/tools/proxytest/proxy-ssl-cert.pem (added)
+++ lenya/trunk/tools/proxytest/proxy-ssl-cert.pem Tue Oct 30 08:43:36 2007
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBTCCA+2gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCQ0gx
+GTAXBgNVBAoTEGxlbnlhLmFwYWNoZS5vcmcxNDAyBgNVBAMUK0xlbnlhIFRlc3Rp
+bmcgQ0EgKGRvbid0IHVzZSBpbiBwcm9kdWN0aW9uISkxIzAhBgkqhkiG9w0BCQEW
+FGRldkBsZW55YS5hcGFjaGUub3JnMB4XDTA3MTAzMDE0MzIxNFoXDTE3MTAyNjE0
+MzIxNFowgYYxCzAJBgNVBAYTAkNIMRkwFwYDVQQKExBsZW55YS5hcGFjaGUub3Jn
+MR8wHQYDVQQLExZGZWFybGVzcyBQcm94eSBUZXN0ZXJzMRYwFAYDVQQDEw1MZW55
+YVNTTFByb3h5MSMwIQYJKoZIhvcNAQkBFhRkZXZAbGVueWEuYXBhY2hlLm9yZzCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALW+2n4QVe3ak/G6mtjBioha
+UmGoihz1ezNa9jbV628jFqP/vVpa8GNnBUqlhjYuRaYkMaPgH7op2CQ85H1F1YKL
+OaoPQAjaUEt/8gH6h1IBdZZT/3d7AQTcs2P8Wt7Tndb58v6ey5vDaBSooSQSWMvi
+FWlf2CC0bAvVNxs+L4RG9SYpHLahX6mIB2yFxsyJ+F0zU+W3Cc3REGXEs29xhS2Q
+pkHv0mtyj0HNAhqsc/WB6//iKoGgAXFRtk0pL/boQcolFDCAieAZwJFmdkEUOERo
+QMkcKH6JQEwIIih5FLxBVGwlnVXW2zpdYFvpwoMM38sPQ9ul4EmB7KCrWOf0j6cC
+AwEAAaOCAX0wggF5MAkGA1UdEwQCMAAwMAYJYIZIAYb4QgENBCMWIVlhU1QgR2Vu
+ZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAwCwYD
+VR0PBAQDAgWgMB0GA1UdDgQWBBShViuhiaMVnX6VB51FFLPh7GIK4TCBuAYDVR0j
+BIGwMIGtgBRdHJ3MOIz+rXDzu8PxGferhmU9kaGBiaSBhjCBgzELMAkGA1UEBhMC
+Q0gxGTAXBgNVBAoTEGxlbnlhLmFwYWNoZS5vcmcxNDAyBgNVBAMUK0xlbnlhIFRl
+c3RpbmcgQ0EgKGRvbid0IHVzZSBpbiBwcm9kdWN0aW9uISkxIzAhBgkqhkiG9w0B
+CQEWFGRldkBsZW55YS5hcGFjaGUub3JnggkAhlawhqjepYgwHwYDVR0RBBgwFoEU
+ZGV2QGxlbnlhLmFwYWNoZS5vcmcwHwYDVR0SBBgwFoEUZGV2QGxlbnlhLmFwYWNo
+ZS5vcmcwDQYJKoZIhvcNAQEFBQADggEBAMh5y/T25t1liWE8WC9KMMF+IiqaC7CX
+WQEOhs8vDgXseY55N7GRwWP7lhM/eZi6IO/+O5f0C0/SZ7makeRdhYA5rwRHhsO8
+uyMPShYZu5mFmLOauDOmRyrViKJUCnumwZX0WTd2Jzz2N1/o9UXzDXG5s6kIW5Bh
++PCG4tLS3JEJfBoUz9lzVjlQsoHBErQZarSI2JW/zhQBiTXWBcAyS3MuuoYy320y
+Jwb2unEaGnGrK7BA2Ete9S122tPXh+1gklogGxjLLDM4GuG4BWme7r6E2lfXki34
+yNeZA+xfoD8Ti3px5FK8y3nRZgjYvcdtixl+JGoR/18FtpUcEPhdfx8=
+-----END CERTIFICATE-----
Added: lenya/trunk/tools/proxytest/proxy-ssl-key.pem
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/proxytest/proxy-ssl-key.pem?rev=590121&view=auto
==============================================================================
--- lenya/trunk/tools/proxytest/proxy-ssl-key.pem (added)
+++ lenya/trunk/tools/proxytest/proxy-ssl-key.pem Tue Oct 30 08:43:36 2007
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtb7afhBV7dqT8bqa2MGKiFpSYaiKHPV7M1r2NtXrbyMWo/+9
+WlrwY2cFSqWGNi5FpiQxo+AfuinYJDzkfUXVgos5qg9ACNpQS3/yAfqHUgF1llP/
+d3sBBNyzY/xa3tOd1vny/p7Lm8NoFKihJBJYy+IVaV/YILRsC9U3Gz4vhEb1Jikc
+tqFfqYgHbIXGzIn4XTNT5bcJzdEQZcSzb3GFLZCmQe/Sa3KPQc0CGqxz9YHr/+Iq
+gaABcVG2TSkv9uhByiUUMICJ4BnAkWZ2QRQ4RGhAyRwofolATAgiKHkUvEFUbCWd
+VdbbOl1gW+nCgwzfyw9D26XgSYHsoKtY5/SPpwIDAQABAoIBAQCcaDMAam6I06Ke
+VUkNYQIndhOPl8vEQD5WY+GgL1j9u+SwHlaGe9yErxQOuYRW/FtUL7HIpgin3Xr1
+NLIuXPrx7X8iqx0ggUC4uNM8gK4UFM1tIbyoxmKKHKUFVxecy+D6MQC9v0raMcBQ
+hw6mTGO+kkJ6/NCy1JJnXIagG1QpMLRgefXx7xwSqTNuqnO45JUoUVczRvBP2/mk
+aKP/g37HPRwc1kiSaDg77xD7kNdHeW0C3GDeW1NgtlMfTjBtRFxNq2LDteEAM6ng
+16bAO6IYShOXmMp00Si3l6Y5gr+TE2GvSXq99/BjmYYRBLMuJSI011/jpYk7pr4f
+bHLMkOKBAoGBANnu8S5yMW0o4JlD74KJGwglguvCLwp+/BDszViWI2jdn1iBMWPv
+Ysz4hlCWm+ZCoCNlDvAVdZAjdjcj+qO+HllxpscAG/x0SXuidU2bZ9wViejwnc6c
+pbIzjzW6v1wF6SZpTE/yQ5edEfXmfXINY40gTIVNuTe1H1zd+yOTDh2rAoGBANV9
+vnlcc/NdsqjNmTvATyNJTqgsG/0rxXxiXqksWmROgj8JpcmWo22WcUPguYly5ZzB
+tYINxY9Q3RO5aEj+FjEtrs/9OeaTcfUZWPoPL2+g5+AnTqCzpbDFK7vpErerSsuX
+5T1guxHQhbBrpIGc/Gc/O8mLEUZ1hRYWTaW2fYH1AoGAESYZOmNn+kP+MHFFFot9
+Yg25mJ2mH/hQE3De07q0vJq74DYCUe/TYXeo8gx35g2WFlLscv3tS1NPCRW+skXS
+k40652vdx+bKpXzqKBozeQEE4hyU/l4bN8OQ4FR6nF4ms4wTojLZGMQWVrg1ZNUi
+4UcKXm74RSbuedtJ2MnIkZMCgYBpKFPfAXwXnsp2vTbCKLqSXfSBf6CVtq7C0s1f
+tPodOFKNbFoeDrYXL6hAz/tzyYVyDjQyiEgMjL8ojQXiFk2mEaNuzYNsoKncGY0r
+Nrmd2Xr9fT8MhxCRHr2pBGf00km4OOxwrCnY34ZKXOsd8M6eqJXxcy+iLhbMx1Wd
+z2LI1QKBgQCqec2KAdF3NiHYnEXc8TInUvyfBPbqXXhCir9wtKm2GVbHa/Ham6IO
+BMSR50Mqrp01EOh1+c+SgbgZoDWgj7+2oZNkIR4xFydkdcVqX2PUIKy+GQA2whI9
+/RbO7xsNoMFtg6cr1a3vY0j1ic0u9QFKj58idOANY3MB0ic5BSFATA==
+-----END RSA PRIVATE KEY-----
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org