diff --git a/tests/AutoconfTest.py b/tests/AutoconfTest.py index 9ea94540f..ec52ef57a 100644 --- a/tests/AutoconfTest.py +++ b/tests/AutoconfTest.py @@ -56,6 +56,10 @@ class AutoconfTest(Test): if "AUTO_LETS_ENCRYPT=yes" not in data["services"]["bunkerweb"]["environment"]: data["services"]["bunkerweb"]["environment"].append("AUTO_LETS_ENCRYPT=yes") data["services"]["bunkerweb"]["environment"].append("USE_LETS_ENCRYPT_STAGING=yes") + data["services"]["bunkerweb"]["environment"].append("LOG_LEVEL=info") + data["services"]["bunkerweb"]["environment"].append("USE_BUNKERNET=no") + data["services"]["bunkerweb"]["environment"].append("SEND_ANONYMOUS_REPORT=no") + data["services"]["bunkerweb"]["environment"].append("USE_DNSBL=no") with open(compose, "w") as f: f.write(dump(data)) proc = run( diff --git a/tests/DockerTest.py b/tests/DockerTest.py index 33d13ed01..406a9d0f4 100644 --- a/tests/DockerTest.py +++ b/tests/DockerTest.py @@ -54,7 +54,7 @@ class DockerTest(Test): Test.replace_in_file( compose, r"AUTO_LETS_ENCRYPT=yes", - "AUTO_LETS_ENCRYPT=yes\n - USE_LETS_ENCRYPT_STAGING=yes\n - LOG_LEVEL=info", + "AUTO_LETS_ENCRYPT=yes\n - USE_LETS_ENCRYPT_STAGING=yes\n - LOG_LEVEL=info\n - USE_BUNKERNET=no\n - SEND_ANONYMOUS_REPORT=no\n - USE_DNSBL=no", ) Test.replace_in_file(compose, r"DISABLE_DEFAULT_SERVER=yes", "DISABLE_DEFAULT_SERVER=no") for ex_domain, test_domain in self._domains.items(): diff --git a/tests/KubernetesTest.py b/tests/KubernetesTest.py index a47c1c877..b494d7eba 100644 --- a/tests/KubernetesTest.py +++ b/tests/KubernetesTest.py @@ -33,6 +33,9 @@ class KubernetesTest(Test): "REAL_IP_FROM": "100.64.0.0/10 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8", "REAL_IP_HEADER": "proxy_protocol", "LOG_LEVEL": "info", + "USE_BUNKERNET": "no", + "SEND_ANONYMOUS_REPORT": "no", + "USE_DNSBL": "no", } replace_env = {"API_WHITELIST_IP": "127.0.0.1/8 100.64.0.0/10 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8"} for yaml in data: diff --git a/tests/LinuxTest.py b/tests/LinuxTest.py index 0dd4e710a..158cd9541 100644 --- a/tests/LinuxTest.py +++ b/tests/LinuxTest.py @@ -115,7 +115,7 @@ class LinuxTest(Test): raise Exception("docker exec cp variables.env failed (test)") proc = self.docker_exec( self.__distro, - "echo '' >> /etc/bunkerweb/variables.env ; echo 'USE_LETS_ENCRYPT_STAGING=yes' >> /etc/bunkerweb/variables.env ; echo 'LOG_LEVEL=info' >> /etc/bunkerweb/variables.env", + "echo '' >> /etc/bunkerweb/variables.env ; echo 'USE_LETS_ENCRYPT_STAGING=yes' >> /etc/bunkerweb/variables.env ; echo 'LOG_LEVEL=info' >> /etc/bunkerweb/variables.env ; echo 'USE_BUNKERNET=no' >> /etc/bunkerweb/variables.env ; echo 'SEND_ANONYMOUS_REPORT=no' >> /etc/bunkerweb/variables.env ; echo 'USE_DNSBL=no' >> /etc/bunkerweb/variables.env", ) if proc.returncode != 0: raise (Exception("docker exec append variables.env failed (test)")) diff --git a/tests/SwarmTest.py b/tests/SwarmTest.py index f2c2081a5..a92eb5fd1 100644 --- a/tests/SwarmTest.py +++ b/tests/SwarmTest.py @@ -33,6 +33,9 @@ class SwarmTest(Test): data["services"]["bunkerweb"]["environment"].append("AUTO_LETS_ENCRYPT=yes") data["services"]["bunkerweb"]["environment"].append("USE_LETS_ENCRYPT_STAGING=yes") data["services"]["bunkerweb"]["environment"].append("LOG_LEVEL=info") + data["services"]["bunkerweb"]["environment"].append("USE_BUNKERNET=no") + data["services"]["bunkerweb"]["environment"].append("SEND_ANONYMOUS_REPORT=no") + data["services"]["bunkerweb"]["environment"].append("USE_DNSBL=no") del data["services"]["bunkerweb"]["deploy"]["placement"] with open(compose, "w") as f: f.write(dump(data))