Changeset 10725 in hybrid


Ignore:
Timestamp:
May 8, 2012, 6:11:40 PM (13 years ago)
Author:
rick
Message:

Laad ook de wleiden.yaml zodat hier de portal_url in gezet kan worden.

Related-To: nodefactory#154

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi

    r10724 r10725  
    5858  'tmpl_login'    : '/usr/local/etc/wlportal/login.tmpl',
    5959  'whitelist'     : [],
    60   'config_file'   : '/usr/local/etc/wlportal/config.yaml',
     60  'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/etc/wleiden.yaml'],
    6161  'expire_time'   : None,
    6262  'accessdb'      : '/var/db/clients',
     
    6767# No failback if config does not exist, to really make sure the user knows if
    6868# the config file failed to parse properly or is non-existing
    69 if os.path.isfile(cfg['config_file']):
    70   cfg.update(yaml.load(open(cfg['config_file'])))
     69for config_file in cfg['config_files']:
     70 if os.path.isfile(config_file):
     71   cfg.update(yaml.load(open(config_file)))
    7172
    7273internet_up = True
Note: See TracChangeset for help on using the changeset viewer.