Corrected some default param values

Check for valid rmi server hostname Preparing release 2.0.1
marclambrichs · Feb 22, 2017 · 0730081 · 0730081
1 parent dc405ab
commit 0730081
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2017-02-22 - Release 2.0.1
+- Fix to improve the quality score on puppetforge.
+- Fixes to templates: some config settings are optional.
+- Changed default group to 'neo4j'. Not all neo4j packages comply (yet).
+
 ## 2017-02-20 - Release 2.0.0
 
 ### Summary

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -7,6 +7,7 @@ Project Owner
 Contributors:
 Amos Wood (amoswood)
 Bram Vogelaar (attachmentgenie)
+Peter Souter (petems)
 Wil Bleker (wbleker)
 Mattias Gees (mattiasgees)
 Jeffrey Meyers (meyersj)

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -102,10 +102,10 @@
   $dbms_jvm_additional_jmxremote_ssl                                 = false
   $dbms_jvm_additional_omit_stacktrace_in_fast_throw                 = '-XX:-OmitStackTraceInFastThrow'
   $dbms_jvm_additional_rmi_server_hostname                           = '-Djava.rmi.server.hostname='
-  $dbms_jvm_additional_ssl_keystore                                  = 'MyCert.jks'
-  $dbms_jvm_additional_ssl_keystore_password                         = 'secret'
-  $dbms_jvm_additional_ssl_truststore                                = 'MyCert.jks'
-  $dbms_jvm_additional_ssl_truststore_password                       = 'secret'
+  $dbms_jvm_additional_ssl_keystore                                  = ''
+  $dbms_jvm_additional_ssl_keystore_password                         = ''
+  $dbms_jvm_additional_ssl_truststore                                = ''
+  $dbms_jvm_additional_ssl_truststore_password                       = ''
   $dbms_jvm_additional_trust_final_non_static_fields                 = '-XX:+TrustFinalNonStaticFields'
   $dbms_jvm_additional_unlock_experimental_vm_options                = '-XX:+UnlockExperimentalVMOptions'
   $dbms_jvm_additional_unsupported_dbms_udc_source                   = 'tarball'

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "mlambrichs-neo4j",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Marc Lambrichs <marc.lambrichs@gmail.com>",
   "license": "Apache-2.0",
   "summary": "A module installing and configuring Neo4j community or enterprise editions.",

diff --git a/templates/configuration/neo4j.conf.general.erb b/templates/configuration/neo4j.conf.general.erb
@@ -183,8 +183,11 @@ dbms.jvm.additional=-Dcom.sun.management.jmxremote.password.file=<%= @config_dir
 dbms.jvm.additional=-Dcom.sun.management.jmxremote.access.file=<%= @config_dir %>/<%= @dbms_jvm_additional_jmxremote_access_file %>
 <% end -%>
 
+<% if @dbms_jvm_additional_rmi_server_hostname !~ /=$/ -%>
 # Some systems cannot discover host name automatically, and need this line configured:
 dbms.jvm.additional=-Djava.rmi.server.hostname=<%= @dbms_jvm_additional_rmi_server_hostname %>
+<% end -%>
+
 
 #-------------------------------------------------------------------------------
 # Logging

diff --git a/templates/configuration/security/3.1/neo4j.conf.authentication.erb b/templates/configuration/security/3.1/neo4j.conf.authentication.erb
@@ -82,10 +82,14 @@ dbms.security.ldap.use_starttls=<%= @dbms_security_ldap_use_starttls %>
 #-----------------------------------------------------------------
 # 7.1.5.5. Use a self-signed certificate in a test environment
 #-----------------------------------------------------------------
+<% if @dbms_jvm_additional_ssl_keystore -%>
 dbms.jvm.additional=-Djavax.net.ssl.keyStore=<%= @dbms_jvm_additional_ssl_keystore %>
 dbms.jvm.additional=-Djavax.net.ssl.keyStorePassword=<%= @dbms_jvm_additional_ssl_keystore_password %>
+<% end -%>
+<% if @dbms_jvm_additional_ssl_truststore -%>
 dbms.jvm.additional=-Djavax.net.ssl.trustStore=<%= @dbms_jvm_additional_ssl_truststore %>
 dbms.jvm.additional=-Djavax.net.ssl.trustStorePassword=<%= @dbms_jvm_additional_ssl_truststore_password %>
+<% end -%>
 
 #-----------------------------------------------------------------
 # Connection pooling