Merge branch 'refactor-ssl-options'

orange-cloudfoundry · Nov 22, 2017 · 883ef3e · 883ef3e
2 parents 08653b5 + ad3e055
commit 883ef3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jobs/cassandra/templates/bin/cql-sh.sh b/jobs/cassandra/templates/bin/cql-sh.sh
@@ -6,7 +6,7 @@ set -u # report the usage of uninitialized variables.
 export LANG=en_US.UTF-8
 
 exec chpst -u vcap:vcap \
-    env HOME=/home/vcap
+    env HOME=/home/vcap \
         /var/vcap/packages/cassandra/bin/cqlsh \
             --cqlshrc /var/vcap/jobs/cassandra/root/.cassandra/cqlshrc \
             "$@"
diff --git a/jobs/cassandra/templates/config/cassandra.yaml.erb b/jobs/cassandra/templates/config/cassandra.yaml.erb
@@ -69,7 +69,7 @@ request_scheduler: <%= p("request_scheduler") %>
 internode_compression: <%= p("internode_compression") %>
 inter_dc_tcp_nodelay: <%= p("inter_dc_tcp_nodelay") %>
 server_encryption_options:
- internode_encryption: <%= p("server_encryption.internode_encryption") %>
+ internode_encryption: <%= p("internode_encryption_mode") %>
  keystore: /var/vcap/jobs/cassandra/config/certs/<%=spec.ip%>_cassandra.keystore
  keystore_password: <%= p("cass_KSP") %>
  truststore: /var/vcap/jobs/cassandra/config/certs/<%=spec.ip%>_cassandra.truststore