diff --git a/Makefile b/Makefile index 8e17806..f2582ec 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ build: python -m venv venv; \ fi; \ venv/bin/pip install -r requirements.txt - + venv/bin/python caddy.py start: sudo venv/bin/waitress-serve --host 0.0.0.0 --port $(PORT) listen:app diff --git a/caddy.py b/caddy.py new file mode 100644 index 0000000..36772cf --- /dev/null +++ b/caddy.py @@ -0,0 +1,18 @@ +from operator import itemgetter +from textwrap import dedent +from deploy import by_branch + + +def build_caddyfile(): + excluded = {"deployer"} + with open("Caddyfile", "w+") as file: + for domain, port in map(itemgetter("domain", "port"), by_branch.values()): + if domain in excluded: + continue + + entry = f""" + {domain}.drm.dev {{ + reverse_proxy localhost:{port} + }} + """ + file.write(dedent(entry)) diff --git a/deploy.py b/deploy.py index 376f81e..257cb24 100644 --- a/deploy.py +++ b/deploy.py @@ -27,21 +27,6 @@ by_branch = { } -def build_caddyfile(): - excluded = {"deployer"} - with open("Caddyfile", "w+") as file: - for domain, port in map(itemgetter("domain", "port"), by_branch.values()): - if domain in excluded: - continue - - entry = f""" - {domain}.drm.dev {{ - reverse_proxy localhost:{port} - }} - """ - file.write(dedent(entry)) - - def handle_request(rq: DeployerRequest): if (rq.user, rq.repo, rq.branch) not in by_branch: print(