Changeset 10827 in hybrid for branches/releng-9.0


Ignore:
Timestamp:
May 13, 2012, 1:01:55 PM (13 years ago)
Author:
rick
Message:

Make sure to load the wleiden.yaml from the proper location.

While here do cleanups at wl-config to make the path display more logical. Do
not show the fact that /usr/local/etc is symlinked to /etc/local. By doing so,
we make sure stuff will be more consistent.

Related-To: ​nodefactory:ticket:164

Location:
branches/releng-9.0/nanobsd/files
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/releng-9.0/nanobsd/files/tools/wl-config

    r10722 r10827  
    4444  'dhcpd.conf')
    4545     STARTUP_LOC="/cfg/local/${FILE}"
    46      RUNNING_LOC="/etc/local/${FILE}"
     46     RUNNING_LOC="/usr/local/etc/${FILE}"
    4747     FILE_HINT="service isc-dhcpd restart"
    4848   ;;
    4949  'dnsmasq.conf')
    5050     STARTUP_LOC="/cfg/local/${FILE}"
    51      RUNNING_LOC="/etc/local/${FILE}"
     51     RUNNING_LOC="/usr/local/etc/${FILE}"
    5252     FILE_HINT="service dnsmasq restart"
    5353   ;;
    … …  
    7878   'wleiden.yaml')
    7979     STARTUP_LOC="/cfg/local/${FILE}"
    80      RUNNING_LOC="/etc/local/${FILE}"
     80     RUNNING_LOC="/usr/local/etc/${FILE}"
    8181   ;;
    8282  esac

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

    r10805 r10827  
    8686  'tmpl_login'    : '/usr/local/etc/wlportal/login.tmpl',
    8787  'whitelist'     : [],
    88   'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/etc/wleiden.yaml'],
     88  'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/usr/local/etc/wleiden.yaml'],
    8989  'expire_time'   : None,
    9090  'accessdb'      : '/var/db/clients',
Note: See TracChangeset for help on using the changeset viewer.