Issue #1615 Moved test keystore and passwords to test-keystore module

jetty · Jul 18, 2017 · 748d582 · 748d582
1 parent 1956087
commit 748d582
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
@@ -350,7 +350,7 @@
               <arguments>
                 <argument>jetty.home=${assembly-directory}</argument>
                 <argument>jetty.base=${assembly-directory}/demo-base</argument>
-                <argument>--add-to-startd=server,continuation,deploy,websocket,ext,resources,client,annotations,jndi,servlets,jsp,jstl,http,https</argument>
+                <argument>--add-to-startd=server,continuation,deploy,websocket,ext,resources,client,annotations,jndi,servlets,jsp,jstl,http,https,test-keystore</argument>
               </arguments>
             </configuration>
             <goals>

diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
@@ -14,9 +14,6 @@ server
 etc/jetty-ssl.xml
 etc/jetty-ssl-context.xml
 
-[files]
-basehome:modules/ssl/keystore|etc/keystore
-
 [ini-template]
 ### TLS(SSL) Connector Configuration
 
@@ -70,17 +67,17 @@ basehome:modules/ssl/keystore|etc/keystore
 # jetty.sslContext.trustStorePath=etc/keystore
 
 ## Keystore password
-# jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+# jetty.sslContext.keyStorePassword=
 
 ## Keystore type and provider
 # jetty.sslContext.keyStoreType=JKS
 # jetty.sslContext.keyStoreProvider=
 
 ## KeyManager password
-# jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+# jetty.sslContext.keyManagerPassword=
 
 ## Truststore password
-# jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+# jetty.sslContext.trustStorePassword=
 
 ## Truststore type and provider
 # jetty.sslContext.trustStoreType=JKS

diff --git a/jetty-server/src/main/config/modules/test-keystore.mod b/jetty-server/src/main/config/modules/test-keystore.mod
@@ -0,0 +1,21 @@
+[description]
+Test keystore with test SSL Certificate.
+DO NOT USE IN PRODUCTION!!!
+
+[tags]
+ssl
+
+[depend]
+ssl
+
+[files]
+basehome:modules/test-keystore/keystore|etc/test-keystore
+
+[ini]
+jetty.sslContext.keyStorePath?=etc/test-keystore
+jetty.sslContext.trustStorePath?=etc/test-keystore
+jetty.sslContext.keyStorePassword?=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+jetty.sslContext.keyStoreType?=JKS
+jetty.sslContext.keyManagerPassword?=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+jetty.sslContext.trustStorePassword?=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+jetty.sslContext.trustStoreType?=JKS
diff --git a/...rver/src/main/config/modules/ssl/keystore → ...ain/config/modules/test-keystore/keystore b/...rver/src/main/config/modules/ssl/keystore → ...ain/config/modules/test-keystore/keystore