From 031a1daa5411a6e7da9c0cf53be4e0551d189be6 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 19 Nov 2022 13:39:41 +0800 Subject: Fix nginx docker and certbot command. --- tool/modules/nginx.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tool/modules/nginx.py') diff --git a/tool/modules/nginx.py b/tool/modules/nginx.py index 62d4044..c6e0a71 100755 --- a/tool/modules/nginx.py +++ b/tool/modules/nginx.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 from .template import Template -from .path import nginx_template_dir +from .path import project_abs_path, nginx_template_dir import json import jsonschema import os @@ -63,8 +63,8 @@ def certbot_command_gen(domain: str, action, test=False) -> str: domains = list_domains(domain) if action == 'create': # create with standalone mode - return f'docker run -it --name certbot -v "./data/certbot/certs:/etc/letsencrypt" -v "./data/certbot/data:/var/lib/letsencrypt" certbot/certbot certonly --standalone -d {" -d ".join(domains)}{ " --test-cert" if test else "" }' + return f'docker run -it --rm --name certbot -v "{project_abs_path}/data/certbot/certs:/etc/letsencrypt" -v "{project_abs_path}/data/certbot/data:/var/lib/letsencrypt" certbot/certbot certonly --standalone -d {" -d ".join(domains)}{ " --test-cert" if test else "" }' elif action == 'renew': # renew with webroot mode - return f'docker run -it --name certbot -v "./data/certbot/certs:/etc/letsencrypt" -v "./data/certbot/data:/var/lib/letsencrypt" -v "./data/certbot/webroot:/var/www/certbot" certbot/certbot renew --webroot -w /var/www/certbot' + return f'docker run -it --rm --name certbot -v "{project_abs_path}/data/certbot/certs:/etc/letsencrypt" -v "{project_abs_path}/data/certbot/data:/var/lib/letsencrypt" -v "{project_abs_path}/data/certbot/webroot:/var/www/certbot" certbot/certbot renew --webroot -w /var/www/certbot' raise ValueError('Invalid action') -- cgit v1.2.3