This is an automated email from the ASF dual-hosted git repository.
DomGarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-uno.git
The following commit(s) were added to refs/heads/main by this push:
new 6ecd801 Fix props file newline potential bugs (#317)
6ecd801 is described below
commit 6ecd801dfe0591422e7a2926d7d9066934d8a8aa
Author: Dom G. <[email protected]>
AuthorDate: Fri Sep 18 11:27:32 2026 -0400
Fix props file newline potential bugs (#317)
* Fix props file newline potential bugs
---------
Co-authored-by: Christopher Tubbs <[email protected]>
---
conf/accumulo/2/accumulo.properties | 2 +-
plugins/accumulo-encryption.sh | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/conf/accumulo/2/accumulo.properties
b/conf/accumulo/2/accumulo.properties
index 60918eb..0f78a59 100755
--- a/conf/accumulo/2/accumulo.properties
+++ b/conf/accumulo/2/accumulo.properties
@@ -7,4 +7,4 @@ tserver.memory.maps.native.enabled=ACCUMULO_USE_NATIVE_MAP
tserver.wal.max.size=512M
tserver.port.search=true
compactor.port.search=true
-sserver.port.search=true
\ No newline at end of file
+sserver.port.search=true
diff --git a/plugins/accumulo-encryption.sh b/plugins/accumulo-encryption.sh
index 3d1bbdf..83ed5ff 100755
--- a/plugins/accumulo-encryption.sh
+++ b/plugins/accumulo-encryption.sh
@@ -24,6 +24,10 @@ fi
accumulo_conf=$ACCUMULO_HOME/conf/accumulo.properties
encrypt_key=$ACCUMULO_HOME/conf/data-encryption.key
-openssl rand -out $encrypt_key 32
-echo "instance.crypto.opts.key.uri=file://$encrypt_key" >>"$accumulo_conf"
-echo "instance.crypto.service=$(jar -tvf
"$ACCUMULO_HOME"/lib/accumulo-core-2.*.jar | grep -o
'org.apache.accumulo.core.*AESCryptoService' | tr / . | tail -1)"
>>"$accumulo_conf"
+openssl rand -out "$encrypt_key" 32
+cat >>"$accumulo_conf" <<EOF
+
+# added by the accumulo-encryption plugin
+instance.crypto.opts.key.uri=file://$encrypt_key
+instance.crypto.service=$(jar -tvf "$ACCUMULO_HOME"/lib/accumulo-core-*.jar |
grep -o 'org.apache.accumulo.core.*AESCryptoService' | tr / . | tail -1)
+EOF
