fofanov.dmitry/configure_nginx_manager
1
0
Fork 0
Code Actions Releases Activity

Добавлены временные wrapper скрипты для хуков auth и cleanup в классе LetsEncryptManager. Обновлены команды certbot для использования этих скриптов и добавлено удаление временных файлов после выполнения.

Browse Source
This commit is contained in:
Dmitriy Fofanov
2025-10-30 07:56:58 +03:00
parent dc432d3f70
commit bcd87a2339
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
letsencrypt_regru_api.py
View File

@@ -1099,13 +1099,30 @@ class LetsEncryptManager:
for d in domains: for d in domains:
domain_args.extend(["-d", d]) domain_args.extend(["-d", d])
# Создаём временные wrapper скрипты для hooks
import tempfile
# Auth hook wrapper
auth_hook_script = tempfile.NamedTemporaryFile(mode='w', suffix='.sh', delete=False)
auth_hook_script.write('#!/bin/bash\n')
auth_hook_script.write(f'{sys.executable} {os.path.abspath(__file__)} --auth-hook\n')
auth_hook_script.close()
os.chmod(auth_hook_script.name, 0o755)
# Cleanup hook wrapper
cleanup_hook_script = tempfile.NamedTemporaryFile(mode='w', suffix='.sh', delete=False)
cleanup_hook_script.write('#!/bin/bash\n')
cleanup_hook_script.write(f'{sys.executable} {os.path.abspath(__file__)} --cleanup-hook\n')
cleanup_hook_script.close()
os.chmod(cleanup_hook_script.name, 0o755)
# Команда certbot # Команда certbot
cmd = [ cmd = [
"certbot", "certonly", "certbot", "certonly",
"--manual", "--manual",
"--preferred-challenges", "dns", "--preferred-challenges", "dns",
"--manual-auth-hook", f"{sys.executable} {os.path.abspath(__file__)} --auth-hook", "--manual-auth-hook", auth_hook_script.name,
"--manual-cleanup-hook", f"{sys.executable} {os.path.abspath(__file__)} --cleanup-hook", "--manual-cleanup-hook", cleanup_hook_script.name,
"--email", self.email, "--email", self.email,
"--agree-tos", "--agree-tos",
"--non-interactive", "--non-interactive",
@@ -1138,6 +1155,13 @@ class LetsEncryptManager:
self.logger.error(f"Ошибка при получении сертификата: {e}") self.logger.error(f"Ошибка при получении сертификата: {e}")
self.logger.error(e.stderr) self.logger.error(e.stderr)
return False return False
finally:
# Удаляем временные wrapper скрипты
try:
os.unlink(auth_hook_script.name)
os.unlink(cleanup_hook_script.name)
except:
pass
def renew_certificate(self) -> bool: def renew_certificate(self) -> bool:
""" """