| Index: src/pubs/default/config/publication.xml |
| =================================================================== |
| --- src/pubs/default/config/publication.xml (revision 594644) |
| +++ src/pubs/default/config/publication.xml (working copy) |
| @@ -128,7 +128,7 @@ |
| The global proxy for non-publication-specific resources shall be |
| http://www.example.com/lenya. |
| --> |
| -<!-- |
| + |
| <proxy area="live" ssl="true" url="https://www.example.com/lenya/customer/live"/> |
| <proxy area="live" ssl="false" url="http://customer.example.com"/> |
| <proxy area="authoring" ssl="true" url="https://www.example.com/lenya/customer/authoring"/> |
| @@ -137,7 +137,7 @@ |
| <proxy area="archive" ssl="false" url="http://www.example.com/lenya/customer/archive"/> |
| <proxy area="trash" ssl="true" url="https://www.example.com/lenya/customer/trash"/> |
| <proxy area="trash" ssl="false" url="http://www.example.com/lenya/customer/trash"/> |
| ---> |
| + |
| </proxies> |
| |
| </publication> |
| Index: src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf |
| =================================================================== |
| --- src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf (revision 594644) |
| +++ src/modules-core/linking/config/cocoon-xconf/globalproxies.xconf (working copy) |
| @@ -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> |
