From: Vsevolod Stakhov Date: Fri, 17 Oct 2025 12:40:08 +0000 (+0100) Subject: [Minor] Fix env variables for integration tests X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=918de1c091ae1046c82f6bfcaf61609c1db1c4b5;p=thirdparty%2Frspamd.git [Minor] Fix env variables for integration tests --- diff --git a/test/integration/configs/fuzzy_check.conf b/test/integration/configs/fuzzy_check.conf index 884775b6f4..57654ac4e1 100644 --- a/test/integration/configs/fuzzy_check.conf +++ b/test/integration/configs/fuzzy_check.conf @@ -9,7 +9,7 @@ rule "rspamd-integration" { servers = "rspamd:50003"; # Encryption settings - encryption_key = "{= env.RSPAMD_FUZZY_ENCRYPTION_KEY =}"; + encryption_key = "{= env.FUZZY_ENCRYPTION_KEY =}"; # Fuzzy flags fuzzy_map = { diff --git a/test/integration/configs/worker-fuzzy.inc b/test/integration/configs/worker-fuzzy.inc index 145c3c176f..67a03b6453 100644 --- a/test/integration/configs/worker-fuzzy.inc +++ b/test/integration/configs/worker-fuzzy.inc @@ -9,6 +9,6 @@ allow_update = ["0.0.0.0/0", "::/0"]; encrypted_only = true; keypair { - privkey = "{= env.RSPAMD_FUZZY_WORKER_PRIVKEY =}"; - pubkey = "{= env.RSPAMD_FUZZY_WORKER_PUBKEY =}"; + privkey = "{= env.FUZZY_WORKER_PRIVKEY =}"; + pubkey = "{= env.FUZZY_WORKER_PUBKEY =}"; } diff --git a/test/integration/configs/worker-normal.inc b/test/integration/configs/worker-normal.inc index 7bc27a2ed7..ff36d8c335 100644 --- a/test/integration/configs/worker-normal.inc +++ b/test/integration/configs/worker-normal.inc @@ -7,6 +7,6 @@ max_tasks = 1000; #Enable encryption for inter-worker communication keypair { - pubkey = "{= env.RSPAMD_WORKER_PUBKEY =}"; - privkey = "{= env.RSPAMD_WORKER_PRIVKEY =}"; + pubkey = "{= env.WORKER_PUBKEY =}"; + privkey = "{= env.WORKER_PRIVKEY =}"; } diff --git a/test/integration/configs/worker-proxy.inc b/test/integration/configs/worker-proxy.inc index d0269daf54..c12f041426 100644 --- a/test/integration/configs/worker-proxy.inc +++ b/test/integration/configs/worker-proxy.inc @@ -13,6 +13,6 @@ milter = yes; #Enable encryption for proxy connections keypair { - pubkey = "{= env.RSPAMD_PROXY_PUBKEY =}"; - privkey = "{= env.RSPAMD_PROXY_PRIVKEY =}"; + pubkey = "{= env.PROXY_PUBKEY =}"; + privkey = "{= env.PROXY_PRIVKEY =}"; }