You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/01/22 01:14:33 UTC
svn commit: r1653720 -
/lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
Author: sarowe
Date: Thu Jan 22 00:14:33 2015
New Revision: 1653720
URL: http://svn.apache.org/r1653720
Log:
Revert accidental change to solr/server/etc/jetty.xml in r1653706
Modified:
lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
Modified: lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml?rev=1653720&r1=1653719&r2=1653720&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml Thu Jan 22 00:14:33 2015
@@ -60,6 +60,33 @@
</Arg>
</Call>
+ <!-- If the connector below is uncommented, then jetty will also accept SSL
+ connections using a self signed certificate, and can optionally require
+ the client to authenticate with a certificate, which can be the same as
+ the server certificate.
+
+ For information about generating the SSL certificate, etc., see:
+
+ https://cwiki.apache.org/confluence/display/solr/Enabling+SSL
+ -->
+ <!--
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
+ <Arg>
+ <New class="org.eclipse.jetty.http.ssl.SslContextFactory">
+ <Set name="keyStore"><SystemProperty name="jetty.home" default="."/>/etc/solr-ssl.keystore.jks</Set>
+ <Set name="keyStorePassword">secret</Set>
+ <Set name="needClientAuth"><SystemProperty name="jetty.ssl.clientAuth" default="false"/></Set>
+ </New>
+ </Arg>
+ <Set name="port"><SystemProperty name="jetty.ssl.port" default="8984"/></Set>
+ <Set name="maxIdleTime">30000</Set>
+ </New>
+ </Arg>
+ </Call>
+ -->
+
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->