accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-13 16:56:33 +00:00
Code Issues Releases Activity

Merge branch 'master' of github.com:frappe/bench into bench-cmd-help

Browse Source
This commit is contained in:
Gavin D'souza 2020-02-17 16:40:34 +05:30
commit 6bfe601dc9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/commands/setup.py
View File

@ -124,7 +124,7 @@ def set_ssh_port(port, force=False):
@click.command("lets-encrypt", help="Setup lets-encrypt SSL for site") @click.command("lets-encrypt", help="Setup lets-encrypt SSL for site")
@click.argument("site") @click.argument("site")
@click.option("--custom-domain") @click.option("--custom-domain")
@click.option("-n", "--non-interactive", default=False, is_flag=True, help="Run certbot non-interactively. Shouldn't be used on 1'st attempt") @click.option('-n', '--non-interactive', default=False, is_flag=True, help="Run command non-interactively. This flag restarts nginx and runs certbot non interactively. Shouldn't be used on 1'st attempt")
def setup_letsencrypt(site, custom_domain, non_interactive): def setup_letsencrypt(site, custom_domain, non_interactive):
from bench.config.lets_encrypt import setup_letsencrypt from bench.config.lets_encrypt import setup_letsencrypt
setup_letsencrypt(site, custom_domain, bench_path=".", interactive=not non_interactive) setup_letsencrypt(site, custom_domain, bench_path=".", interactive=not non_interactive)

7
bench/config/lets_encrypt.py
View File

@ -29,9 +29,10 @@ def setup_letsencrypt(site, custom_domain, bench_path, interactive):
print("No custom domain named {0} set for site".format(custom_domain)) print("No custom domain named {0} set for site".format(custom_domain))
return return
click.confirm('Running this will stop the nginx service temporarily causing your sites to go offline\n' if interactive:
'Do you want to continue?', click.confirm('Running this will stop the nginx service temporarily causing your sites to go offline\n'
abort=True) 'Do you want to continue?',
abort=True)
if not get_config(bench_path).get("dns_multitenant"): if not get_config(bench_path).get("dns_multitenant"):
print("You cannot setup SSL without DNS Multitenancy") print("You cannot setup SSL without DNS Multitenancy")