Fix tls connection options (#49)

haraka · Dec 2, 2023 · 45e8936 · 45e8936
1 parent d43868a
commit 45e8936
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/config/elasticsearch.ini b/config/elasticsearch.ini
@@ -18,7 +18,7 @@
 ; username: haraka
 ; password: nice-long-pass-phrase
 
-; [ssl]
+; [tls]
 ; rejectUnauthorized=false
 
 

diff --git a/index.js b/index.js
@@ -64,7 +64,7 @@ exports.get_es_hosts = function () {
 
     plugin.clientArgs = { nodes: plugin.cfg.es_hosts };
     if (plugin.cfg.auth) plugin.clientArgs.auth = plugin.cfg.auth;
-    if (plugin.cfg.ssl)  plugin.clientArgs.ssl = plugin.cfg.ssl;
+    if (plugin.cfg.tls)  plugin.clientArgs.tls = plugin.cfg.tls;
 }
 
 exports.es_connect = function (done) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-elasticsearch",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Haraka plugin that saves logs to Elasticsearch",
   "main": "index.js",
   "scripts": {

diff --git a/test/config.js b/test/config.js
@@ -53,7 +53,7 @@ describe('get_es_hosts', function () {
         done();
     })
 
-    it('applies auth & ssl config to client config', function (done) {
+    it('applies auth & tls config to client config', function (done) {
         console.log(this.plugin.cfg);
         this.plugin.config.root_path = path.resolve('test', 'fixtures');
         this.plugin.load_es_ini();
@@ -67,7 +67,7 @@ describe('get_es_hosts', function () {
                 "https://user:[email protected]:9200",
                 "http://127.0.0.1:9200"
             ],
-            "ssl": {
+            "tls": {
                 "rejectUnauthorized": false
             }
         });

diff --git a/test/fixtures/elasticsearch.ini b/test/fixtures/elasticsearch.ini
@@ -19,7 +19,7 @@
 username=haraka
 password=nice-long-pass-phrase
 
-[ssl]
+[tls]
 rejectUnauthorized=false
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
     ; username: haraka
     ; password: nice-long-pass-phrase
-    ; [ssl]
+    ; [tls]
     ; rejectUnauthorized=false
@@ Expand Down @@