From a84cecac6bef1211cf8ab245d997b6ac64b6686a Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 4 May 2021 21:43:55 +0200
Subject: [Test] Use automatically exported variables

---
 test/functional/configs/clickhouse-config.xml    |  8 ++++----
 test/functional/configs/clickhouse.conf          | 14 +++++++-------
 test/functional/configs/fuzzy_master_worker.conf |  2 +-
 test/functional/configs/fuzzy_slave_worker.conf  |  2 +-
 test/functional/configs/nginx.conf               |  6 +++---
 test/functional/configs/pluginsplus.conf         | 14 +++++++-------
 test/functional/configs/redis-server.conf        | 10 +++++-----
 test/functional/configs/url_tags.conf            |  2 +-
 8 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'test/functional/configs')

diff --git a/test/functional/configs/clickhouse-config.xml b/test/functional/configs/clickhouse-config.xml
index 30f556f0c..3b5c914cd 100644
--- a/test/functional/configs/clickhouse-config.xml
+++ b/test/functional/configs/clickhouse-config.xml
@@ -3,8 +3,8 @@
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>debug</level>
-        <log>${TMPDIR}/clickhouse/clickhouse-server.log</log>
-        <errorlog>${TMPDIR}/clickhouse/clickhouse-server.err.log</errorlog>
+        <log>${RSPAMD_TMPDIR}/clickhouse/clickhouse-server.log</log>
+        <errorlog>${RSPAMD_TMPDIR}/clickhouse/clickhouse-server.err.log</errorlog>
         <size>1000M</size>
         <count>10</count>
         <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
@@ -14,7 +14,7 @@
     <http_port>${CLICKHOUSE_PORT}</http_port>
 
     <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
-    <users_config>${TMPDIR}/users.xml</users_config>
+    <users_config>${RSPAMD_TMPDIR}/users.xml</users_config>
 
     <!-- <listen_reuse_port>0</listen_reuse_port> -->
 
@@ -37,7 +37,7 @@
     <mark_cache_size>5368709120</mark_cache_size>
 
     <!-- Path to data directory, with trailing slash. -->
-    <path>${TMPDIR}/clickhouse/</path>
+    <path>${RSPAMD_TMPDIR}/clickhouse/</path>
 
     <!-- Default profile of settings. -->
     <default_profile>default</default_profile>
diff --git a/test/functional/configs/clickhouse.conf b/test/functional/configs/clickhouse.conf
index 08a3614a5..f92f2e759 100644
--- a/test/functional/configs/clickhouse.conf
+++ b/test/functional/configs/clickhouse.conf
@@ -1,6 +1,6 @@
 options = {
   filters = ["spf", "dkim", "regexp"]
-  pidfile = "${TMPDIR}/rspamd.pid"
+  pidfile = "${RSPAMD_TMPDIR}/rspamd.pid"
   lua_path = "${INSTALLROOT}/share/rspamd/lib/?.lua"
   dns {
     nameserver = ["8.8.8.8", "8.8.4.4"];
@@ -34,7 +34,7 @@ clickhouse {
 logging = {
   type = "file",
   level = "debug"
-  filename = "${TMPDIR}/rspamd.log"
+  filename = "${RSPAMD_TMPDIR}/rspamd.log"
 }
 metric = {
   name = "default",
@@ -45,19 +45,19 @@ metric = {
 }
 worker {
   type = normal
-  bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL}
+  bind_socket = ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_NORMAL}
   count = 1
   task_timeout = 60s;
 }
 worker {
         type = controller
-        bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER}
+        bind_socket = ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER}
         count = 1
         secure_ip = ["127.0.0.1", "::1"];
-        stats_path = "${TMPDIR}/stats.ucl"
+        stats_path = "${RSPAMD_TMPDIR}/stats.ucl"
 }
-lua = "${TESTDIR}/lua/test_coverage.lua";
+lua = "${RSPAMD_TESTDIR}/lua/test_coverage.lua";
 modules {
-    path = "${TESTDIR}/../../src/plugins/lua/"
+    path = "${RSPAMD_TESTDIR}/../../src/plugins/lua/"
 }
 lua = "${INSTALLROOT}/share/rspamd/rules/rspamd.lua"
diff --git a/test/functional/configs/fuzzy_master_worker.conf b/test/functional/configs/fuzzy_master_worker.conf
index 0424afc86..37c238d8d 100644
--- a/test/functional/configs/fuzzy_master_worker.conf
+++ b/test/functional/configs/fuzzy_master_worker.conf
@@ -7,6 +7,6 @@ sync_keypair {
 }
 slave {
 	name = "slave1";
-        hosts = "${LOCAL_ADDR}:${PORT_FUZZY_SLAVE}";
+        hosts = "${RSPAMD_LOCAL_ADDR}:${PORT_FUZZY_SLAVE}";
 	key = "caen11q4eczdqgsb8u55zmmoh4z5qxd61y1rph7pz1fcubmfccdy";
 }
diff --git a/test/functional/configs/fuzzy_slave_worker.conf b/test/functional/configs/fuzzy_slave_worker.conf
index 44ed1de71..353a5def6 100644
--- a/test/functional/configs/fuzzy_slave_worker.conf
+++ b/test/functional/configs/fuzzy_slave_worker.conf
@@ -7,5 +7,5 @@ sync_keypair {
 	type = "kex";
 }
 
-masters = "${LOCAL_ADDR}";
+masters = "${RSPAMD_LOCAL_ADDR}";
 master_key = "kmtnjffjzq9bq8qe14ii4gb4e1ihuq84ubfibe79ba85ob5nr3my";
diff --git a/test/functional/configs/nginx.conf b/test/functional/configs/nginx.conf
index 72472d16e..9a27f4924 100644
--- a/test/functional/configs/nginx.conf
+++ b/test/functional/configs/nginx.conf
@@ -1,8 +1,8 @@
 events {
 }
 worker_processes  1;
-pid   ${TMPDIR}/nginx.pid;
-error_log  ${TMPDIR}/error.log;
+pid   ${RSPAMD_TMPDIR}/nginx.pid;
+error_log  ${RSPAMD_TMPDIR}/error.log;
 http {
     default_type application/octet-stream;
     sendfile     on;
@@ -13,7 +13,7 @@ http {
         server_name localhost;
 
         location / {
-            root      ${TMPDIR};
+            root      ${RSPAMD_TMPDIR};
             autoindex on;
         }
     }
diff --git a/test/functional/configs/pluginsplus.conf b/test/functional/configs/pluginsplus.conf
index 6422f9f42..52c7b54a0 100644
--- a/test/functional/configs/pluginsplus.conf
+++ b/test/functional/configs/pluginsplus.conf
@@ -1,7 +1,7 @@
 options = {
 	filters = ["spf", "dkim", "regexp"]
-	url_tld = "${URL_TLD}"
-	pidfile = "${TMPDIR}/rspamd.pid"
+	url_tld = "${RSPAMD_URL_TLD}"
+	pidfile = "${RSPAMD_TMPDIR}/rspamd.pid"
 	lua_path = "${INSTALLROOT}/share/rspamd/lib/?.lua"
 	dns {
 		nameserver = ["8.8.8.8", "8.8.4.4"];
@@ -12,7 +12,7 @@ options = {
 logging = {
 	type = "file",
 	level = "debug"
-	filename = "${TMPDIR}/rspamd.log"
+	filename = "${RSPAMD_TMPDIR}/rspamd.log"
 }
 metric = {
 	name = "default",
@@ -23,19 +23,19 @@ metric = {
 }
 worker {
 	type = normal
-	bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL}
+	bind_socket = ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_NORMAL}
 	count = 1
 	task_timeout = 60s;
 }
 worker {
         type = controller
-        bind_socket = ${LOCAL_ADDR}:${PORT_CONTROLLER}
+        bind_socket = ${RSPAMD_LOCAL_ADDR}:${RSPAMD_PORT_CONTROLLER}
         count = 1
         secure_ip = ["127.0.0.1", "::1"];
-        stats_path = "${TMPDIR}/stats.ucl"
+        stats_path = "${RSPAMD_TMPDIR}/stats.ucl"
 }
 modules {
-    path = "${TESTDIR}/../../src/plugins/lua/"
+    path = "${RSPAMD_TESTDIR}/../../src/plugins/lua/"
 }
 lua = "${LUA}";
 ${PLUGIN_CONFIG}
diff --git a/test/functional/configs/redis-server.conf b/test/functional/configs/redis-server.conf
index 0636a36ef..094302575 100644
--- a/test/functional/configs/redis-server.conf
+++ b/test/functional/configs/redis-server.conf
@@ -1,7 +1,7 @@
-bind ${REDIS_ADDR}
+bind ${RSPAMD_REDIS_ADDR}
 daemonize yes
 loglevel debug
-logfile ${TMPDIR}/redis.log
-pidfile ${TMPDIR}/redis.pid
-port ${REDIS_PORT}
-dir ${TMPDIR}
+logfile ${RSPAMD_TMPDIR}/redis.log
+pidfile ${RSPAMD_TMPDIR}/redis.pid
+port ${RSPAMD_REDIS_PORT}
+dir ${RSPAMD_TMPDIR}
diff --git a/test/functional/configs/url_tags.conf b/test/functional/configs/url_tags.conf
index ca3d2e34b..9c82b84e4 100644
--- a/test/functional/configs/url_tags.conf
+++ b/test/functional/configs/url_tags.conf
@@ -1,7 +1,7 @@
 url_tags {
 }
 redis {
-  servers = "${REDIS_ADDR}:${REDIS_PORT}";
+  servers = "${RSPAMD_REDIS_ADDR}:${RSPAMD_REDIS_PORT}";
 }
 
 options {
-- 
cgit v1.2.3