Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor environment variable handling in AutoconfTest, DockerTest, and SwarmTest to use dictionary assignment and add CUSTOM_LOG_LEVEL

Browse source
This commit is contained in:
Théophile Diot 2024-12-24 12:14:36 +01:00
parent 59f5b2e65d
commit 6fc4b52653
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
3 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/AutoconfTest.py
View file

@ -53,13 +53,15 @@ class AutoconfTest(Test):
with open(compose, "r") as f:
data = safe_load(f.read())
data["services"]["bunkerweb"]["volumes"] = ["/tmp/www:/var/www/html"]
if "AUTO_LETS_ENCRYPT=yes" not in data["services"]["bw-scheduler"]["environment"]:
data["services"]["bw-scheduler"]["environment"].append("AUTO_LETS_ENCRYPT=yes")
data["services"]["bw-scheduler"]["environment"].append("USE_LETS_ENCRYPT_STAGING=yes")
data["services"]["bw-scheduler"]["environment"].append("LOG_LEVEL=info")
data["services"]["bw-scheduler"]["environment"].append("USE_BUNKERNET=no")
data["services"]["bw-scheduler"]["environment"].append("SEND_ANONYMOUS_REPORT=no")
data["services"]["bw-scheduler"]["environment"].append("USE_DNSBL=no")
if data["services"]["bw-scheduler"]["environment"].get("AUTO_LETS_ENCRYPT", "no") != "yes":
data["services"]["bw-scheduler"]["environment"]["AUTO_LETS_ENCRYPT"] = "yes"
data["services"]["bw-scheduler"]["environment"]["USE_LETS_ENCRYPT_STAGING"] = "yes"
data["services"]["bw-scheduler"]["environment"]["CUSTOM_LOG_LEVEL"] = "debug"
data["services"]["bw-autoconf"]["environment"]["CUSTOM_LOG_LEVEL"] = "debug"
data["services"]["bw-scheduler"]["environment"]["LOG_LEVEL"] = "info"
data["services"]["bw-scheduler"]["environment"]["USE_BUNKERNET"] = "no"
data["services"]["bw-scheduler"]["environment"]["SEND_ANONYMOUS_REPORT"] = "no"
data["services"]["bw-scheduler"]["environment"]["USE_DNSBL"] = "no"
with open(compose, "w") as f:
f.write(dump(data))
proc = run(

20
tests/DockerTest.py
View file

@ -1,3 +1,5 @@
from json import dump
from yaml import safe_load
from Test import Test
from os.path import isdir, isfile
from os import getenv
@ -51,12 +53,18 @@ class DockerTest(Test):
Test.replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/")
Test.replace_in_file(compose, r"\- bw_data:/", "- /tmp/bw-data:/")
Test.replace_in_file(compose, r"\- bw\-data:/", "- /tmp/bw-data:/")
Test.replace_in_file(
compose,
r"AUTO_LETS_ENCRYPT=yes",
"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")
with open(compose, "r") as f:
data = safe_load(f.read())
data["services"]["bw-scheduler"]["environment"]["CUSTOM_LOG_LEVEL"] = "debug"
data["services"]["bw-scheduler"]["environment"]["AUTO_LETS_ENCRYPT"] = "yes"
data["services"]["bw-scheduler"]["environment"]["USE_LETS_ENCRYPT_STAGING"] = "yes"
data["services"]["bw-scheduler"]["environment"]["LOG_LEVEL"] = "info"
data["services"]["bw-scheduler"]["environment"]["USE_BUNKERNET"] = "no"
data["services"]["bw-scheduler"]["environment"]["SEND_ANONYMOUS_REPORT"] = "no"
data["services"]["bw-scheduler"]["environment"]["USE_DNSBL"] = "no"
data["services"]["bw-scheduler"]["environment"]["DISABLE_DEFAULT_SERVER"] = "no"
with open(compose, "w") as f:
f.write(dump(data))
for ex_domain, test_domain in self._domains.items():
Test.replace_in_files(test, ex_domain, test_domain)
Test.rename(test, ex_domain, test_domain)

16
tests/SwarmTest.py
View file

@ -29,13 +29,15 @@ class SwarmTest(Test):
compose = "/tmp/swarm/stack.yml"
with open(compose, "r") as f:
data = safe_load(f.read())
if "AUTO_LETS_ENCRYPT=yes" not in data["services"]["bw-scheduler"]["environment"]:
data["services"]["bw-scheduler"]["environment"].append("AUTO_LETS_ENCRYPT=yes")
data["services"]["bw-scheduler"]["environment"].append("USE_LETS_ENCRYPT_STAGING=yes")
data["services"]["bw-scheduler"]["environment"].append("LOG_LEVEL=info")
data["services"]["bw-scheduler"]["environment"].append("USE_BUNKERNET=no")
data["services"]["bw-scheduler"]["environment"].append("SEND_ANONYMOUS_REPORT=no")
data["services"]["bw-scheduler"]["environment"].append("USE_DNSBL=no")
if data["services"]["bw-scheduler"]["environment"].get("AUTO_LETS_ENCRYPT", "no") != "yes":
data["services"]["bw-scheduler"]["environment"]["AUTO_LETS_ENCRYPT"] = "yes"
data["services"]["bw-scheduler"]["environment"]["USE_LETS_ENCRYPT_STAGING"] = "yes"
data["services"]["bw-scheduler"]["environment"]["CUSTOM_LOG_LEVEL"] = "debug"
data["services"]["bw-autoconf"]["environment"]["CUSTOM_LOG_LEVEL"] = "debug"
data["services"]["bw-scheduler"]["environment"]["LOG_LEVEL"] = "info"
data["services"]["bw-scheduler"]["environment"]["USE_BUNKERNET"] = "no"
data["services"]["bw-scheduler"]["environment"]["SEND_ANONYMOUS_REPORT"] = "no"
data["services"]["bw-scheduler"]["environment"]["USE_DNSBL"] = "no"
del data["services"]["bunkerweb"]["deploy"]["placement"]
with open(compose, "w") as f:
f.write(dump(data))