Specify encryption for HTTP connectors.

neo4j · Oct 7, 2016 · 0c59801 · 0c59801
1 parent 30b9d7d
commit 0c59801
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...rver-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java b/...rver-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java
@@ -93,6 +93,7 @@ public void shouldBeAbleToStartInSingleMode() throws Exception
                 "-c", configOption( logs_directory, tempDir.getRoot().getAbsolutePath() ),
                 "-c", configOption( certificates_directory, getRelativePath( folder.getRoot(), certificates_directory ) ),
                 "-c", "dbms.connector.1.type=HTTP",
+                "-c", "dbms.connector.1.encryption=NONE",
                 "-c", "dbms.connector.1.enabled=true" );
 
         // Then
@@ -113,6 +114,7 @@ public void shouldBeAbleToStartInHAMode() throws Exception
                 "-c", configOption( logs_directory, tempDir.getRoot().getAbsolutePath() ),
                 "-c", configOption( certificates_directory, getRelativePath( folder.getRoot(), certificates_directory ) ),
                 "-c", "dbms.connector.1.type=HTTP",
+                "-c", "dbms.connector.1.encryption=NONE",
                 "-c", "dbms.connector.1.enabled=true" );
 
         // Then
@@ -129,6 +131,7 @@ public void debugLoggingDisabledByDefault() throws Exception
         Map<String, String> properties = stringMap();
         properties.putAll( ServerTestUtils.getDefaultRelativeProperties() );
         properties.put( "dbms.connector.1.type", "HTTP" );
+        properties.put( "dbms.connector.1.encryption", "NONE" );
         properties.put( "dbms.connector.1.enabled", "true" );
         store( properties, configFile );
 
@@ -154,6 +157,7 @@ public void debugLoggingEnabledBySetting() throws Exception
         Map<String, String> properties = stringMap( store_internal_log_level.name(), "DEBUG");
         properties.putAll( ServerTestUtils.getDefaultRelativeProperties() );
         properties.put( "dbms.connector.1.type", "HTTP" );
+        properties.put( "dbms.connector.1.encryption", "NONE" );
         properties.put( "dbms.connector.1.enabled", "true" );
         store( properties, configFile );
 

diff --git a/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java b/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java
@@ -83,6 +83,7 @@ public void createFiles() throws IOException
         configFile = new File( testDirectory.directory(), "neo4j.conf" );
         Properties props = new Properties();
         props.setProperty( ClientConnectorSettings.httpConnector( "1" ).type.name(), "HTTP" );
+        props.setProperty( ClientConnectorSettings.httpConnector( "1" ).encryption.name(), "NONE" );
         props.setProperty( ClientConnectorSettings.httpConnector( "1" ).enabled.name(), "true" );
         try ( FileWriter writer = new FileWriter( configFile ) )
         {