From 541b646980df5cf32b09cb42e93304888d88967f Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 7 May 2023 14:08:31 +0200 Subject: [PATCH] increase drupal delay time for tests, fix tmp dir not created for realip-download job and fix has_*_variable check when multisite is yes --- examples/drupal/tests.json | 2 +- src/bw/lua/bunkerweb/utils.lua | 8 ++++++-- src/common/core/realip/jobs/realip-download.py | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/drupal/tests.json b/examples/drupal/tests.json index 6158582cc..cc1edd375 100644 --- a/examples/drupal/tests.json +++ b/examples/drupal/tests.json @@ -3,7 +3,7 @@ "kinds": ["docker", "autoconf", "swarm", "kubernetes", "linux"], "no_copy_container": true, "timeout": 60, - "delay": 60, + "delay": 120, "tests": [ { "type": "string", diff --git a/src/bw/lua/bunkerweb/utils.lua b/src/bw/lua/bunkerweb/utils.lua index 4671c2e05..049bb386b 100644 --- a/src/bw/lua/bunkerweb/utils.lua +++ b/src/bw/lua/bunkerweb/utils.lua @@ -64,7 +64,9 @@ utils.has_variable = function(var, value) return true, "success" end end - return false, "success" + if servers ~= "" then + return false, "success" + end end return check_value == value, "success" end @@ -93,7 +95,9 @@ utils.has_not_variable = function(var, value) return true, "success" end end - return false, "success" + if servers ~= "" then + return false, "success" + end end return check_value ~= value, "success" end diff --git a/src/common/core/realip/jobs/realip-download.py b/src/common/core/realip/jobs/realip-download.py index 4923fb7a3..7843d7fb0 100755 --- a/src/common/core/realip/jobs/realip-download.py +++ b/src/common/core/realip/jobs/realip-download.py @@ -64,8 +64,9 @@ try: logger.info("RealIP is not activated, skipping download...") _exit(0) - # Create directory if it doesn't exist + # Create directories if they don't exist Path("/var/cache/bunkerweb/realip").mkdir(parents=True, exist_ok=True) + Path("/var/tmp/bunkerweb/realip").mkdir(parents=True, exist_ok=True) db = Database( logger,