aboutsummaryrefslogtreecommitdiffstats
path: root/config/freeradius2/freeradius.xml
diff options
context:
space:
mode:
Diffstat (limited to 'config/freeradius2/freeradius.xml')
-rw-r--r--config/freeradius2/freeradius.xml87
1 files changed, 49 insertions, 38 deletions
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml
index 2e19b30f..5f8226c7 100644
--- a/config/freeradius2/freeradius.xml
+++ b/config/freeradius2/freeradius.xml
@@ -200,6 +200,7 @@
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
@@ -207,18 +208,47 @@
<type>listtopic</type>
</field>
<field>
+ <fielddescr>sortable</fielddescr>
+ <fieldname>sortable</fieldname>
+ <display_maximum_rows>0</display_maximum_rows>
+ <type>sorting</type>
+ <include_filtering_inputbox/>
+ <sortablefields>
+ <item><name>Username</name><fieldname>varusersusername</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>One-Time-Password</name><fieldname>varusersmotpenable</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>Simultaneous Connections</name><fieldname>varuserssimultaneousconnect</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>IP Address</name><fieldname>varusersframedipaddress</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>Expiration Date</name><fieldname>varusersexpiration</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>Session Timeout</name><fieldname>varuserssessiontimeout</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>Possible Login Times</name><fieldname>varuserslogintime</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>VLAN ID</name><fieldname>varusersvlanid</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ <item><name>Description</name><fieldname>description</fieldname><regex>/%FILTERTEXT%/i</regex></item>
+ </sortablefields>
+ </field>
+ <field>
<fielddescr>Username</fielddescr>
<fieldname>varusersusername</fieldname>
- <description><![CDATA[Enter the username. Whitespace is possible. If you do not want to use username/password but custom options then leave this empty.]]></description>
+ <description><![CDATA[Enter the username. Whitespace is possible. If you do not want to use username/password but custom options then leave this field empty.]]></description>
<type>input</type>
</field>
<field>
<fielddescr>Password</fielddescr>
<fieldname>varuserspassword</fieldname>
- <description><![CDATA[Enter the password for this username. If you do not want to use username/password but custom options then leave this empty.]]></description>
+ <description><![CDATA[Enter the password for this username. If you do not want to use username/password but custom options then leave this field empty.]]></description>
<type>password</type>
</field>
<field>
+ <fielddescr>Password encryption</fielddescr>
+ <fieldname>varuserspasswordencryption</fieldname>
+ <description><![CDATA[Select the password encryption for this user. Default: Cleartext-Password]]></description>
+ <type>select</type>
+ <default_value>Cleartext-Password</default_value>
+ <options>
+ <option><name>Cleartext-Password</name><value>Cleartext-Password</value></option>
+ <option><name>MD5-Password</name><value>MD5-Password</value></option>
+ </options>
+ </field>
+ <field>
<fielddescr>Enable One-Time-Password for this user</fielddescr>
<fieldname>varusersmotpenable</fieldname>
<description><![CDATA[This enables the possibility to authenticate against an username and an one-time-password. The client to generate OTP can be installed on various mobile device plattforms like Android and more.<br><br>
@@ -256,13 +286,13 @@
<field>
<fielddescr>Number of simultaneous connections</fielddescr>
<fieldname>varuserssimultaneousconnect</fieldname>
- <description><![CDATA[The maximum of simultaneous connections with this username. If you leave this field empty than there is no limit. If you are using FreeRADIUS with CaptivePortal you should leave this empty.]]></description>
+ <description><![CDATA[The maximum of simultaneous connections with this username. If you leave this field empty than there is no limit. If you are using FreeRADIUS with CaptivePortal you should leave this empty. Read the documentation!]]></description>
<type>input</type>
</field>
<field>
<fielddescr>Redirection URL</fielddescr>
<fieldname>varuserswisprredirectionurl</fieldname>
- <description><![CDATA[Enter the URL the user should be redirected to after successfull login. (e.g.: http://www.pfsense.org)]]></description>
+ <description><![CDATA[Enter the URL the user should be redirected to after successfull login. (e.g.: http://www.google.com)]]></description>
<type>input</type>
</field>
<field>
@@ -337,7 +367,7 @@
<field>
<fielddescr>Amount of Time</fielddescr>
<fieldname>varusersamountoftime</fieldname>
- <description><![CDATA[Enter the amount of time for this user in seconds.]]></description>
+ <description><![CDATA[Enter the amount of time for this user in minutes.]]></description>
<type>input</type>
</field>
<field>
@@ -358,53 +388,34 @@
<type>listtopic</type>
</field>
<field>
- <fielddescr>Amount of Upload Traffic</fielddescr>
- <fieldname>varusersamountofbytesinput</fieldname>
- <description><![CDATA[Enter the amount of upload traffic for this user in <b>bytes</b>. There is a bug in CaptivePortal which counts the traffic six times faster than in reality. So if a user should have 1MB of traffic you must calculate 6+1MB and enter here: 6000000.]]></description>
+ <fielddescr>Amount of Download and Upload Traffic</fielddescr>
+ <fieldname>varusersmaxtotaloctets</fieldname>
+ <description><![CDATA[Enter the amount of download and upload traffic (summarized) for this user in <b>MegaByte (MB)</b>. There is a bug in CP (pfSense v2.0.x) which counts the real traffic many times faster and incorrect.]]></description>
<type>input</type>
</field>
<field>
<fielddescr>Time Period</fielddescr>
- <fieldname>varuserspointoftimebytesinput</fieldname>
- <description><![CDATA[Select the time period for the amount of upload traffic.]]></description>
+ <fieldname>varusersmaxtotaloctetstimerange</fieldname>
+ <description><![CDATA[Select the time period for the amount of download and upload traffic. This does not automatically reset the counter. You need to setup a cronjob (with cron package) which will reset the counter. Read the documentation!]]></description>
<type>select</type>
<default_value>daily</default_value>
<options>
- <option><name>Daily</name><value>Daily</value></option>
- <option><name>Weekly</name><value>Weekly</value></option>
- <option><name>Monthly</name><value>Monthly</value></option>
- <option><name>Forever</name><value>Forever</value></option>
- </options>
- </field>
- <field>
- <fielddescr>Amount of Download Traffic</fielddescr>
- <fieldname>varusersamountofbytesoutput</fieldname>
- <description><![CDATA[Enter the amount of download traffic for this user in <b>bytes</b>. There is a bug in CaptivePortal which counts the traffic six times faster than in reality. So if a user should have 1MB of traffic you must calculate 6+1MB and enter here: 6000000.]]></description>
- <type>input</type>
- </field>
- <field>
- <fielddescr>Time Period</fielddescr>
- <fieldname>varuserspointoftimebytesoutput</fieldname>
- <description><![CDATA[Select the time period for the amount of download limit.]]></description>
- <type>select</type>
- <default_value>daily</default_value>
- <options>
- <option><name>Daily</name><value>Daily</value></option>
- <option><name>Weekly</name><value>Weekly</value></option>
- <option><name>Monthly</name><value>Monthly</value></option>
- <option><name>Forever</name><value>Forever</value></option>
+ <option><name>Daily</name><value>daily</value></option>
+ <option><name>Weekly</name><value>weekly</value></option>
+ <option><name>Monthly</name><value>monthly</value></option>
+ <option><name>Forever</name><value>forever</value></option>
</options>
</field>
<field>
- <fielddescr>Maximum Download Bandwidth</fielddescr>
+ <fielddescr>Maximum Bandwidth Down</fielddescr>
<fieldname>varusersmaxbandwidthdown</fieldname>
- <description><![CDATA[Enter the maximum bandwidth for download in bps (<b>bits</b> per second).]]></description>
+ <description><![CDATA[Enter the maximum bandwidth for download in <b>KiloBits</b> per second.]]></description>
<type>input</type>
</field>
<field>
- <fielddescr>Maximum Upload Bandwidth</fielddescr>
+ <fielddescr>Maximum Bandwidth Up</fielddescr>
<fieldname>varusersmaxbandwidthup</fieldname>
- <description><![CDATA[Enter the maximum bandwidth for upload in bps (<b>bits</b> per second).]]></description>
+ <description><![CDATA[Enter the maximum bandwidth for upload in <b>KiloBits</b> per second.]]></description>
<type>input</type>
</field>
<field>
@@ -463,4 +474,4 @@
<custom_php_deinstall_command>
freeradius_deinstall_command();
</custom_php_deinstall_command>
-</packagegui> \ No newline at end of file
+</packagegui>