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

Update test configurations to use 'bw-scheduler' service and adjust environment variables

Browse source
This commit is contained in:
Théophile Diot 2024-12-24 11:19:18 +01:00
parent 32f6db39af
commit 65cacf5412
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
4 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/AutoconfTest.py
View file

@ -36,7 +36,7 @@ class AutoconfTest(Test):
if isdir("/tmp/www"):
rmtree("/tmp/www")
mkdir("/tmp/www")
copy("./misc/integrations/autoconf.yml", "/tmp/autoconf/docker-compose.yml")
copy("./misc/integrations/autoconf.mariadb.yml", "/tmp/autoconf/docker-compose.yml")
compose = "/tmp/autoconf/docker-compose.yml"
Test.replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "local/bunkerweb-tests:latest")
Test.replace_in_file(
@ -53,13 +53,13 @@ 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"]["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")
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")
with open(compose, "w") as f:
f.write(dump(data))
proc = run(

2
tests/KubernetesTest.py
View file

@ -39,7 +39,7 @@ class KubernetesTest(Test):
}
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:
if yaml["metadata"]["name"] == "bunkerweb":
if yaml["metadata"]["name"] == "bunkerweb-scheduler":
for k, v in append_env.items():
yaml["spec"]["template"]["spec"]["containers"][0]["env"].append({"name": k, "value": v})
for ele in yaml["spec"]["template"]["spec"]["containers"][0]["env"]:

7
tests/LinuxTest.py
View file

@ -32,6 +32,9 @@ class LinuxTest(Test):
if proc.returncode != 0:
raise Exception("docker exec apt install failed (linux stack)")
proc = LinuxTest.docker_exec(distro, "systemctl start bunkerweb")
if proc.returncode != 0:
raise Exception("docker exec systemctl start failed (linux stack)")
proc = LinuxTest.docker_exec(distro, "systemctl start bunkerweb-scheduler")
if proc.returncode != 0:
raise Exception("docker exec systemctl start failed (linux stack)")
if distro in ("ubuntu", "debian", "ubuntu-jammy"):
@ -119,7 +122,7 @@ class LinuxTest(Test):
)
if proc.returncode != 0:
raise (Exception("docker exec append variables.env failed (test)"))
proc = self.docker_exec(self.__distro, "systemctl stop bunkerweb ; systemctl start bunkerweb")
proc = self.docker_exec(self.__distro, "systemctl restart bunkerweb-scheduler")
if proc.returncode != 0:
raise Exception("docker exec systemctl restart failed (linux stack)")
except:
@ -154,7 +157,7 @@ class LinuxTest(Test):
def _debug_fail(self):
self.docker_exec(
self.__distro,
"cat /var/log/bunkerweb/access.log ; cat /var/log/bunkerweb/error.log ; journalctl -u bunkerweb --no-pager",
"cat /var/log/bunkerweb/access.log ; cat /var/log/bunkerweb/error.log ; journalctl -u bunkerweb --no-pager ; journalctl -u bunkerweb-scheduler --no-pager",
)
@staticmethod

14
tests/SwarmTest.py
View file

@ -29,13 +29,13 @@ 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"]["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")
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")
del data["services"]["bunkerweb"]["deploy"]["placement"]
with open(compose, "w") as f:
f.write(dump(data))