aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2022-11-19 13:43:40 +0800
committercrupest <crupest@outlook.com>2022-11-19 13:43:40 +0800
commit23287cb6ff316275cef5d588a7e3a2f89f622b25 (patch)
tree900d4a0953b1f6994790bfdfdd00aae8b6a77030
parent031a1daa5411a6e7da9c0cf53be4e0551d189be6 (diff)
downloadcrupest-23287cb6ff316275cef5d588a7e3a2f89f622b25.tar.gz
crupest-23287cb6ff316275cef5d588a7e3a2f89f622b25.tar.bz2
crupest-23287cb6ff316275cef5d588a7e3a2f89f622b25.zip
Fix certbot create command and subdomain: halo -> blog.
-rw-r--r--template/nginx/server.json2
-rwxr-xr-xtool/modules/nginx.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/template/nginx/server.json b/template/nginx/server.json
index cad0cb3..1c3165c 100644
--- a/template/nginx/server.json
+++ b/template/nginx/server.json
@@ -11,7 +11,7 @@
},
{
"type": "reverse-proxy",
- "subdomain": "halo",
+ "subdomain": "blog",
"upstream": {
"name": "halo",
"server": "halo:8090"
diff --git a/tool/modules/nginx.py b/tool/modules/nginx.py
index c6e0a71..a731db7 100755
--- a/tool/modules/nginx.py
+++ b/tool/modules/nginx.py
@@ -63,7 +63,7 @@ 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 --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 "" }'
+ 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" -p "0.0.0.0:80:80" 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 --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'