Skip to content

Fix certbot auto-renewal & hands-free cert creation #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hcooper wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix certbot auto-renewal & hands-free cert creation #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions deploy_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,8 @@ def start_site(site_config: SiteConfig, options: List[str]):
@deploy_command
def enable_tls(site_config: SiteConfig, options: List[str]):
variable_declarations, docker_compose_command = make_docker_compose_script(
'exec {} certbot --nginx'.format(site_config.reverse_proxy_service), site_config)
'exec {} certbot --nginx --non-interactive -d {} -d www.{}'.format(
site_config.reverse_proxy_service, site_config.hostname, site_config.hostname), site_config)
script_name = 'enable_tls.bat' if platform.system() == 'Windows' else 'enable_tls.sh'
script = os.path.join(os.path.dirname(os.path.abspath(__file__)), script_name)
with open(script, 'w') as f:
Expand All @@ -402,16 +403,6 @@ def renew_certs(site_config: SiteConfig, options: List[str]):
run_docker_compose('exec {reverse_proxy_container} certbot renew'.format(
reverse_proxy_container=site_config.reverse_proxy_service), site_config)

@deploy_command
def add_cert_cronjob(site_config: SiteConfig, options: List[str]):

deploy_tool = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'deploy_tool.py')
cert_renewal_log = os.path.join(site_config.logs_folder, 'cert_renewals.log')
cmd_to_run = 'python3 {deploy_tool} {site_name} renew_certs >> {cert_renewal_log} 2>&1'.format(
db_password=site_config.db_password, deploy_tool=deploy_tool, site_name=site_config.name,
cert_renewal_log=cert_renewal_log)
run_cmd('crontab -l | {{ cat; echo "0 */12 * * * {cmd}"; }} | crontab -'.format(cmd=cmd_to_run))

@deploy_command
def redeploy(site_config: SiteConfig, options: List[str]):
redeploy_targets = {'webserver', 'db', 'reverse_proxy', 'backup_manager', 'mailserver'}
Expand Down
2 changes: 1 addition & 1 deletion reverse_proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nginx

RUN apt-get update
RUN apt-get -y install certbot python3-certbot-nginx
RUN apt-get -y install certbot python3-certbot-nginx procps less cron

# Set up startup behavior
COPY ./reverse_proxy/scripts/system_start.sh /root/system_start.sh
Expand Down
1 change: 1 addition & 0 deletions reverse_proxy/scripts/system_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ else
fi

echo "RopeWiki reverse proxy running nginx..."
cron &
nginx -g "daemon off;"