accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-11 15:51:03 +00:00
Code Issues Releases Activity

Add config option to switch off default site serving, fix #38

Browse Source
This commit is contained in:
Pratik Vyas 2014-07-25 12:15:16 +05:30
parent fedf007a11
commit 7f10e0c020
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bench/cli.py
View File

@ -225,6 +225,13 @@ def config_dns_multitenant(state):
state = True if state == 'on' else False state = True if state == 'on' else False
update_config({'dns_multitenant': state}) update_config({'dns_multitenant': state})
@click.command('serve_default_site')
@click.argument('state', type=click.Choice(['on', 'off']))
def config_dns_multitenant(state):
"Configure nginx to serve the default site on port 80"
state = True if state == 'on' else False
update_config({'serve_default_site': state})
config.add_command(config_auto_update) config.add_command(config_auto_update)
config.add_command(config_update_bench_on_update) config.add_command(config_update_bench_on_update)
config.add_command(config_restart_supervisor_on_update) config.add_command(config_restart_supervisor_on_update)

14
bench/config.py
View File

@ -12,8 +12,6 @@ def generate_supervisor_config(bench='.'):
sites_dir = os.path.join(bench_dir, "sites") sites_dir = os.path.join(bench_dir, "sites")
sites = get_sites(bench=bench) sites = get_sites(bench=bench)
user = getpass.getuser() user = getpass.getuser()
with open("sites/currentsite.txt") as f:
default_site = f.read().strip()
config = template.render(**{ config = template.render(**{
"bench_dir": bench_dir, "bench_dir": bench_dir,
@ -40,11 +38,15 @@ def generate_nginx_config(bench='.'):
sites_dir = os.path.join(bench_dir, "sites") sites_dir = os.path.join(bench_dir, "sites")
sites = get_sites_with_config(bench=bench) sites = get_sites_with_config(bench=bench)
user = getpass.getuser() user = getpass.getuser()
if get_config().get('serve_default_site'):
try:
with open("sites/currentsite.txt") as f: with open("sites/currentsite.txt") as f:
default_site = f.read().strip() default_site = {'name': f.read().strip()}
default_site = { except IOError:
'name': default_site default_site = None
} else:
default_site = None
config = template.render(**{ config = template.render(**{
"sites_dir": sites_dir, "sites_dir": sites_dir,