fix(lets-encrypt): run command non interactively if flag passed

Bloomstack · Feb 11, 2020 · 7ccc275 · 7ccc275
1 parent c8fa035
commit 7ccc275
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bench/commands/setup.py b/bench/commands/setup.py
@@ -122,7 +122,7 @@ def set_ssh_port(port, force=False):
 @click.command('lets-encrypt')
 @click.argument('site')
 @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):
 	"Setup lets-encrypt for site"
 	from bench.config.lets_encrypt import setup_letsencrypt

diff --git a/bench/config/lets_encrypt.py b/bench/config/lets_encrypt.py
@@ -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))
 			return
 
-	click.confirm('Running this will stop the nginx service temporarily causing your sites to go offline\n'
-		'Do you want to continue?',
-		abort=True)
+	if interactive:
+		click.confirm('Running this will stop the nginx service temporarily causing your sites to go offline\n'
+			'Do you want to continue?',
+			abort=True)
 
 	if not get_config(bench_path).get("dns_multitenant"):
 		print("You cannot setup SSL without DNS Multitenancy")