Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2512 → Rev 2513

/CHANGELOG
6,6 → 6,7
NEWS
- Linux kernel 4.14.20.
- Replace Apache with Lighttpd
- Add "Maximum of data exchanged daily/monthly" attributes.
 
ACC
- Add "nfsen", "fail2ban" and "vnstat" services to the ACC system page.
/conf/freeradius-web/sql.attrmap
51,4 → 51,8
replyitem Reply-Message Reply-Message
replyItem Dialup-Lock-Msg Reply-Message
replyItem User-Password User-Password
replyItem WISPr-Redirection-URL WISPr-Redirection-URL
replyItem WISPr-Redirection-URL WISPr-Redirection-URL
 
checkItem Alcasar-Expire-After Alcasar-Expire-After
checkItem CoovaChilli-Max-Total-Octets-Daily CoovaChilli-Max-Total-Octets-Daily
checkItem CoovaChilli-Max-Total-Octets-Monthly CoovaChilli-Max-Total-Octets-Monthly
/conf/freeradius-web/user_edit.attrs
17,6 → 17,8
Login-Time <a href="help/login_time_help.html" target=lt_help onclick=window.open("help/login_time_help.html","lt_help","width=600,height=370,toolbar=no,scrollbars=no,resizable=yes") title="Login-Time Help Page"><font color="blue">P&eacute;riode hebdomadaire</font></a>
CoovaChilli-Max-Input-Octets <a href="help/coovachilli_max_input_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_input_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Input Octets Help Page"><font color="blue">Nombre d'octets max. en &eacute;mission</font></a><BR>(en octets)
CoovaChilli-Max-Output-Octets <a href="help/coovachilli_max_output_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_output_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Output Octets Help Page"><font color="blue">Nombre d'octets max. en r&eacute;ception</font></a><BR>(en octets)
CoovaChilli-Max-Total-Octets-Daily <a href="help/coovachilli_max_total_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_total_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Total Octets Daily Help Page"><font color="blue">Nombre d'octets max. total transmit par jour</font></a><BR>(en octets)
CoovaChilli-Max-Total-Octets-Monthly <a href="help/coovachilli_max_total_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_total_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Total Octets Monthly Help Page"><font color="blue">Nombre d'octets max. total transmit par mois</font></a><BR>(en octets)
CoovaChilli-Max-Total-Octets <a href="help/coovachilli_max_total_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_total_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Total Octets Help Page"><font color="blue">Nombre d'octets max. total transmit</font></a><BR>(en octets)
CoovaChilli-Bandwidth-Max-Up <a href="help/coovachilli_bandwidth_max_up_help.html" target=st_help onclick=window.open("help/coovachilli_bandwidth_max_up_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Bandwidth Max Up Help Page"><font color="blue">Bande passante montante max.</font></a><BR>(en kbits/seconde)
CoovaChilli-Bandwidth-Max-Down <a href="help/coovachilli_bandwidth_max_down_help.html" target=st_help onclick=window.open("help/coovachilli_bandwidth_max_down_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Bandwidth Max Down Help Page"><font color="blue">Bande passante descendante max.</font></a><BR>(en kbits/seconde)
/conf/radius/alcasar
21,10 → 21,13
 
authorize {
sql
expire_on_login
noresetcounter
dailycounter
monthlycounter
expiration
counterCoovaChilliMaxTotalOctetsDaily
counterCoovaChilliMaxTotalOctetsMonthly
logintime
pap
}
/conf/radius/alcasar-with-ldap
21,10 → 21,13
 
authorize {
sql
expire_on_login
noresetcounter
dailycounter
monthlycounter
expiration
counterCoovaChilliMaxTotalOctetsDaily
counterCoovaChilliMaxTotalOctetsMonthly
logintime
pap
ldap {
/conf/radius/sqlcounter
35,3 → 35,27
reset = never
$INCLUDE ${modconfdir}/sql/counter/mysql/${.:instance}.conf
}
 
sqlcounter counterCoovaChilliMaxTotalOctetsDaily {
sql_module_instance = sql
counter_name = CoovaChilli-Max-Total-Octets-Daily
check_name = CoovaChilli-Max-Total-Octets-Daily
counter_type = data
reply_name = CoovaChilli-Max-Total-Octets
sqlmod-inst = sql
key = User-Name
reset = daily
query = "SELECT IFNULL((SUM(AcctInputOctets + AcctOutputOctets)),0) FROM radacct WHERE username='%{${key}}' AND UNIX_TIMESTAMP(AcctStartTime) + AcctSessionTime > '%%b'"
}
 
sqlcounter counterCoovaChilliMaxTotalOctetsMonthly {
sql_module_instance = sql
counter_name = CoovaChilli-Max-Total-Octets-Monthly
check_name = CoovaChilli-Max-Total-Octets-Monthly
counter_type = data
reply_name = CoovaChilli-Max-Total-Octets
sqlmod-inst = sql
key = User-Name
reset = monthly
query = "SELECT IFNULL((SUM(AcctInputOctets + AcctOutputOctets)),0)FROM radacct WHERE username='%{${key}}' AND UNIX_TIMESTAMP(AcctStartTime) + AcctSessionTime > '%%b'"
}
/web/acc/manager/htdocs/group_new.php
235,6 → 235,16
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets;
break;
case 'CoovaChilli-Max-Total-Octets-Daily' :
$advanced = true;
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets_daily;
break;
case 'CoovaChilli-Max-Total-Octets-Monthly' :
$advanced = true;
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets_monthly;
break;
case 'CoovaChilli-Bandwidth-Max-Up' :
$advanced = true;
$help_link = "help/coovachilli_bandwidth_max_up_help.html";
293,6 → 303,8
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=";
break;
case 'Session-Timeout' :
347,6 → 359,8
case 'Alcasar-Protocols-Filter' :
case 'Alcasar-Status-Page-Must-Stay-Open' :
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
/web/acc/manager/htdocs/user_edit.php
268,6 → 268,12
case 'CoovaChilli-Max-Total-Octets' :
$grp_maxto = $val;
break;
case 'CoovaChilli-Max-Total-Octets-Daily' :
$grp_maxtoDaily = $val;
break;
case 'CoovaChilli-Max-Total-Octets-Monthly' :
$grp_maxtoMonthly = $val;
break;
case 'CoovaChilli-Bandwidth-Max-Up' :
$grp_bwup = $val;
break;
480,6 → 486,16
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets;
break;
case 'CoovaChilli-Max-Total-Octets-Daily' :
$advanced = true;
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets_daily;
break;
case 'CoovaChilli-Max-Total-Octets-Monthly' :
$advanced = true;
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets_monthly;
break;
case 'CoovaChilli-Bandwidth-Max-Up' :
$advanced = true;
$help_link = "help/coovachilli_bandwidth_max_up_help.html";
539,6 → 555,8
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>";
break;
case 'Session-Timeout' :
590,6 → 608,8
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
663,6 → 683,12
case 'CoovaChilli-Max-Total-Octets' :
echo "$grp_maxto";
break;
case 'CoovaChilli-Max-Total-Octets-Daily' :
echo "$grp_maxtoDaily";
break;
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "$grp_maxtoMonthly";
break;
case 'CoovaChilli-Bandwidth-Max-Up' :
echo "$grp_bwup";
break;
/web/acc/manager/htdocs/user_new.php
310,6 → 310,16
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets;
break;
case 'CoovaChilli-Max-Total-Octets-Daily' :
$advanced = true;
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets_daily;
break;
case 'CoovaChilli-Max-Total-Octets-Monthly' :
$advanced = true;
$help_link = "help/coovachilli_max_total_octets_help.html";
$desc = $l_max_total_octets_monthly;
break;
case 'CoovaChilli-Bandwidth-Max-Up' :
$advanced = true;
$help_link = "help/coovachilli_bandwidth_max_up_help.html";
368,6 → 378,8
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>";
break;
case 'Session-Timeout' :
419,6 → 431,8
case 'Login-Time' :
case 'Expiration' :
case 'Alcasar-Expire-After' :
case 'CoovaChilli-Max-Total-Octets-Daily' :
case 'CoovaChilli-Max-Total-Octets-Monthly' :
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">";
break;
case 'Session-Timeout' :
/web/acc/manager/lib/langues.php
91,6 → 91,8
$l_max_input_octets = "Maximum de données émises<br>(en octets)";
$l_max_output_octets = "Maximum de données reçues<br>(en octets)";
$l_max_total_octets = "Maximum de données échangées<br>(en octets)";
$l_max_total_octets_daily = "Maximum de données échangées par jour<br>(en octets)";
$l_max_total_octets_monthly = "Maximum de données échangées par mois<br>(en octets)";
$l_max_bandwidth_up = "Limite de débit montant<br>(en kbits/seconde)";
$l_max_bandwidth_down = "Limite de débit descendant<br>(en kbits/seconde)";
$l_wispr_redirection = "URL de redirection";
217,6 → 219,8
$l_max_input_octets = "Maximum of data uploaded<br>(in octets)";
$l_max_output_octets = "Maximum of data downloaded<br>(in octets)";
$l_max_total_octets = "Maximum of data exchanged<br>(in octets)";
$l_max_total_octets_daily = "Maximum of data exchanged daily<br>(in octets)";
$l_max_total_octets_monthly = "Maximum of data exchanged monthly<br>(in octets)";
$l_max_bandwidth_up = "Maximum upload bandwidth<br>(in kbits/second)";
$l_max_bandwidth_down = "Maximum download bandwidth<br>(in kbits/second)";
$l_wispr_redirection = "Redirection URL";