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/20 18:05:05 UTC
svn commit: r1653300 -
/lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
Author: sarowe
Date: Tue Jan 20 17:05:04 2015
New Revision: 1653300
URL: http://svn.apache.org/r1653300
Log:
SOLR-7006: Update the commented-out SSL config in server/etc/jetty.xml: refer to the Enabling SSL Ref Guide page and don't mention solrtest.keystore
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=1653300&r1=1653299&r2=1653300&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml Tue Jan 20 17:05:04 2015
@@ -60,24 +60,14 @@
</Arg>
</Call>
- <!-- if the connector below is uncommented, then jetty will also accept SSL
- connections on port 8984, 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_
+ <!-- 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.
- # Run solr example with SSL on port 8984
- java -jar start.jar
- #
- # Run post.jar so that it trusts the server cert...
- java -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-
- # Run solr example with SSL requiring client certs on port 8984
- java -Djetty.ssl.clientAuth=true -jar start.jar
- #
- # Run post.jar so that it trusts the server cert,
- # and authenticates with a client cert
- java -Djavax.net.ssl.keyStorePassword=secret -Djavax.net.ssl.keyStore=../etc/solrtest.keystore -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-
+ For information about generating the SSL certificate, etc., see:
+
+ https://cwiki.apache.org/confluence/display/solr/Enabling+SSL
-->
<!--
<Call name="addConnector">
@@ -85,7 +75,7 @@
<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/solrtest.keystore</Set>
+ <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>