From 45e89366a71b24bb940eb01852b97caa107dbaa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20RICCIO?= Date: Sat, 2 Dec 2023 17:06:50 +0100 Subject: [PATCH] Fix tls connection options (#49) --- config/elasticsearch.ini | 2 +- index.js | 2 +- package.json | 2 +- test/config.js | 4 ++-- test/fixtures/elasticsearch.ini | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/elasticsearch.ini b/config/elasticsearch.ini index a34c577..25360ee 100644 --- 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 index 7fc6662..f23c31a 100644 --- 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 index a37c0f7..248eea1 100644 --- 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 index ba3cd5a..4d4b911 100644 --- 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:password@172.16.10.1:9200", "http://127.0.0.1:9200" ], - "ssl": { + "tls": { "rejectUnauthorized": false } }); diff --git a/test/fixtures/elasticsearch.ini b/test/fixtures/elasticsearch.ini index 567949b..fe2dab2 100644 --- 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