[Minor] Fix env variables for integration tests

diff --git a/test/integration/configs/fuzzy_check.conf b/test/integration/configs/fuzzy_check.conf
index 884775b6f47f81ac4e4a889575e334e7c21dcb89..57654ac4e151a45349bbe96ee7efd18dc3d03cb9 100644 (file)
--- 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 145c3c176fe8cbf488e6a0d9a7601a77b4eb7f18..67a03b6453130b01b7b7200a3b959f1ac2606d23 100644 (file)
--- 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 7bc27a2ed7a010aa6e5a08eebab2fb1ba05af000..ff36d8c335d6a94fd53c3d821177381e7bff5441 100644 (file)
--- 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 d0269daf54f1161adbfe91ed6322816dc152a455..c12f041426777c6f0ffd3abc6eb1533e9412b7e3 100644 (file)
--- 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 =}";
 }