accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-09-23 20:49:01 +00:00
Code Issues Releases Activity

fix: dont abort script if not overwriting scripts (#919)

Browse Source 
* fix: dont abort script if not overwriting scripts

why: currently, running of `bench ` or `bench setup
production` creates nginx conf files and asks for confirmation before
overwriting them. in case user doesnt want to overwrite files,
`setup production` and `lets-encrypt` is exitted abrubtly and nginx isnt started again after

* fix: use click.confirm instead of six.moves.input

* fix: use click.confirm instead of six.moves.input

* chore: remove unused imports
This commit is contained in:
gavin 2020-02-28 15:33:00 +05:30 committed by GitHub
parent ddcd2c11a1
commit ec1343c0fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bench/config/nginx.py
View File

@ -1,8 +1,24 @@
import os, json, click, random, string, hashlib
from bench.utils import get_sites, get_bench_name, exec_cmd
# imports - standard imports
import hashlib
import os
import random
import string
# imports - third party imports
import click
from six import string_types
# imports - module imports
from bench.utils import get_bench_name, get_sites
def make_nginx_conf(bench_path, yes=False):
conf_path = os.path.join(bench_path, "config", "nginx.conf")
if not yes and os.path.exists(conf_path):
if not click.confirm('nginx.conf already exists and this will overwrite it. Do you want to continue?'):
return
from bench import env
from bench.config.common_site_config import get_config
@ -37,10 +53,6 @@ def make_nginx_conf(bench_path, yes=False):
nginx_conf = template.render(**template_vars)
conf_path = os.path.join(bench_path, "config", "nginx.conf")
if not yes and os.path.exists(conf_path):
click.confirm('nginx.conf already exists and this will overwrite it. Do you want to continue?',
abort=True)
with open(conf_path, "w") as f:
f.write(nginx_conf)