accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-09-29 07:19:05 +00:00
Code Issues Releases Activity

fix: removed patch

Browse Source
This commit is contained in:
Abhishek Balam 2020-09-09 21:31:57 +05:30
parent 75caa0f93c
commit 87edc4e109
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bench/config/lets_encrypt.py
View File

@ -87,9 +87,13 @@ def run_certbot_and_setup_ssl(site, custom_domain, bench_path, interactive=True)
def setup_crontab(): def setup_crontab():
job_command = '/opt/certbot-auto renew -a nginx --post-hook "systemctl reload nginx"' job_command = '/opt/certbot-auto renew -a nginx --post-hook "systemctl reload nginx"'
job_comment = 'Renew lets-encrypt every month'
system_crontab = CronTab(user='root') system_crontab = CronTab(user='root')
if job_command not in str(system_crontab):
job = system_crontab.new(command=job_command, comment="Renew lets-encrypt every month") for job in system_crontab.find_comment(comment=job_comment): # Removes older entries
system_crontab.remove(job)
job = system_crontab.new(command=job_command, comment=job_comment)
job.setall('0 0 */1 * *') # Run at 00:00 every day-of-month job.setall('0 0 */1 * *') # Run at 00:00 every day-of-month
system_crontab.write() system_crontab.write()
@ -113,10 +117,13 @@ def get_certbot_path():
def renew_certs(): def renew_certs():
# Needs to be run with sudo
click.confirm('Running this will stop the nginx service temporarily causing your sites to go offline\n' click.confirm('Running this will stop the nginx service temporarily causing your sites to go offline\n'
'Do you want to continue?', 'Do you want to continue?',
abort=True) abort=True)
setup_crontab()
service('nginx', 'stop') service('nginx', 'stop')
exec_cmd("{path} renew".format(path=get_certbot_path())) exec_cmd("{path} renew".format(path=get_certbot_path()))
service('nginx', 'start') service('nginx', 'start')

19
bench/patches/v5/fix_letsencrypt_renew_frequency.py
View File

@ -1,19 +0,0 @@
from bench.config.common_site_config import get_config
from crontab import CronTab
def execute(bench_path):
"""
This patch fixes a cron job that would renew letsencrypt certificate
"""
job_command = '/opt/certbot-auto renew -a nginx --post-hook "systemctl reload nginx"'
system_crontab = CronTab(user='root')
job_comment = "Renew lets-encrypt every month"
for job in system_crontab.find_comment(job_comment):
system_crontab.remove(job)
job = system_crontab.new(command=job_command, comment=job_comment)
job.setall('0 0 */1 * *') # Run at 00:00 every day-of-month
system_crontab.write()
break