Changeset 10725 in hybrid for branches/releng-9.0/nanobsd

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:

• branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi (modified) (2 diffs)

branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi

@@ -58 +58 @@
   'tmpl_login'    : '/usr/local/etc/wlportal/login.tmpl',
   'whitelist'     : [],
-  'config_file'   : '/usr/local/etc/wlportal/config.yaml',
+  'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/etc/wleiden.yaml'],
   'expire_time'   : None,
   'accessdb'      : '/var/db/clients',
@@ -67 +67 @@
 # No failback if config does not exist, to really make sure the user knows if
 # the config file failed to parse properly or is non-existing
-if os.path.isfile(cfg['config_file']):
-  cfg.update(yaml.load(open(cfg['config_file'])))
+for config_file in cfg['config_files']:
+ if os.path.isfile(config_file):
+   cfg.update(yaml.load(open(config_file)))
 
 internet_up = True