diff options
Diffstat (limited to 'config/freeradius.inc')
| -rw-r--r-- | config/freeradius.inc | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/config/freeradius.inc b/config/freeradius.inc index 6e81f0a0..6f0b1f38 100644 --- a/config/freeradius.inc +++ b/config/freeradius.inc @@ -26,8 +26,8 @@ function freeradius_install_command() { $rcfile = array(); $rcfile['file'] = 'radiusd.sh'; - $rcfile['start'] = 'radiusd -s &'; - $rcfile['stop'] = 'killall radiusd'; + $rcfile['start'] = 'logger -f /var/log/system.log "freeRADIUS rc_start: killing all existing radiusd processes" && killall -9 radiusd ; sleep 5 && logger -f /var/log/system.log "freeRADIUS rc_start: starting radiusd " ; radiusd -s &'; + $rcfile['stop'] = 'logger -f /var/log/system.log "freeRADIUS rc_stop: killing all existing radiusd processes" && killall -9 radiusd ; sleep 5 && logger -f /var/log/system.log "freeRADIUS rc_stop: radiusd has quit"'; conf_mount_rw(); write_rcfile($rcfile); conf_mount_ro(); @@ -36,16 +36,19 @@ function freeradius_install_command() { function freeradius_settings_resync() { global $config; - $settings = $config['installedpackages']['freeradiussettings']['config'][0]; - $iface = ($settings['interface'] ? $settings['interface'] : 'LAN'); $iface = convert_friendly_interface_to_real_interface_name($iface); $iface_ip = find_interface_ip($iface); + $interface_ip = $settings['interface_ip']; $port = ($settings['port'] != '' ? $settings['port'] : 0); - $radiuslogging = $settings['radiuslogging']; - $radiuslogbadpass = $settings['radiuslogbadpass']; - $radiusloggoodpass = $settings['radiusloggoodpass']; + $radiuslogging = $settings['radiuslogging']; + $radiuslogbadpass = $settings['radiuslogbadpass']; + $radiusloggoodpass = $settings['radiusloggoodpass']; + $max_requests_var = $settings['max_requests_var']; + $max_request_time_var = $settings['max_request_time_var']; + $cleanup_delay_var = $settings['cleanup_delay_var']; + $logdir_var = $settings['logdir_var']; // FreeRADIUS's configuration is huge // This is the standard default config file, trimmed down a bit. Somebody might want to implement more options. It should be as simple as editing this, then also providing the settings in each file that was included here (or maybe just put the config inlined here). @@ -55,7 +58,7 @@ exec_prefix = \${prefix} sysconfdir = \${prefix}/etc localstatedir = /var sbindir = \${exec_prefix}/sbin -logdir = /var/log +logdir = $logdir_var raddbdir = \${sysconfdir}/raddb radacctdir = \${logdir}/radacct confdir = \${raddbdir} @@ -65,11 +68,11 @@ libdir = \${exec_prefix}/lib pidfile = \${run_dir}/radiusd.pid #user = nobody #group = nobody -max_request_time = 30 +max_request_time = $max_request_time_var delete_blocked_requests = no -cleanup_delay = 5 -max_requests = 1024 -bind_address = $iface_ip +cleanup_delay = $cleanup_delay_var +max_requests = $max_requests_var +bind_address = $interface_ip port = $port hostname_lookups = no allow_core_dumps = no @@ -447,21 +450,29 @@ function freeradius_users_resync() { foreach ($users as $user) { $username = $user['username']; $password = $user['password']; - $multiconnet = $user['multiconnet']; - $ip = $user['ip']; - $userexpiration=$user['expiration']; - $sessiontime=$user['sessiontime']; - $onlinetime=$user['onlinetime']; - $vlanid=$user['vlanid']; - $additionaloptions=$user['additionaloptions']; - $atrib=''; - $head="$username User-Password == ".'"'.$password.'"'; + $multiconnect = $user['multiconnect']; + $ip = $user['ip']; + $subnetmask = $user['subnetmask']; + $gateway = $user['gateway']; + $userexpiration=$user['expiration']; + $sessiontime=$user['sessiontime']; + $onlinetime=$user['onlinetime']; + $vlanid=$user['vlanid']; + $additionaloptions=$user['additionaloptions']; + $atrib=''; + $head="$username User-Password == ".'"'.$password.'"'; if ($multiconnect <> '') { - $head .=", Simultaneous-Use += $multiconnet"; + $head .=", Simultaneous-Use := $multiconnect"; } - if ($x <> '') { + if ($userexpiration <> '') { $head .=", Expiration := ".'"'.$userexpiration.'"'; } + if ($subnetmask<> '') { + $head .=", Framed-IP-Netmask = $subnetmask"; + } + if ($gateway<> '') { + $head .=", Framed-Route = $gateway"; + } if ($onlinetime <> '') { $head .=", Login-Time := ". '"' . $onlinetime .'"'; } |