diff options
| -rw-r--r-- | config/freeradius2/freeradius.xml | 16 | ||||
| -rw-r--r-- | config/freeradius2/freeradiusauthorizedmacs.xml | 14 | ||||
| -rw-r--r-- | config/freeradius2/freeradiuscerts.xml | 2 | ||||
| -rw-r--r-- | config/freeradius2/freeradiusclients.xml | 10 | ||||
| -rw-r--r-- | config/freeradius2/freeradiuseapconf.xml | 22 | ||||
| -rw-r--r-- | config/freeradius2/freeradiusinterfaces.xml | 4 | ||||
| -rw-r--r-- | config/freeradius2/freeradiusmodulesldap.xml | 8 | ||||
| -rw-r--r-- | config/freeradius2/freeradiussettings.xml | 17 | ||||
| -rw-r--r-- | config/freeradius2/freeradiussqlconf.xml | 30 |
9 files changed, 62 insertions, 61 deletions
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml index 13b4123a..8cef9430 100644 --- a/config/freeradius2/freeradius.xml +++ b/config/freeradius2/freeradius.xml @@ -204,7 +204,7 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -280,19 +280,19 @@ <default_value>0</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <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. Read the documentation!]]></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 Captive Portal 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.google.com)]]></description> + <description><![CDATA[Enter the URL the user should be redirected to after successful login. (e.g.: http://www.google.com)]]></description> <type>input</type> </field> <field> @@ -302,7 +302,7 @@ <type>input</type> </field> <field> - <name>NETWORK CONFIGURATION</name> + <name>Network Configuration</name> <type>listtopic</type> </field> <field> @@ -339,7 +339,7 @@ <type>input</type> </field> <field> - <name>TIME CONFIGURATION</name> + <name>Time Configuration</name> <type>listtopic</type> </field> <field> @@ -384,7 +384,7 @@ </options> </field> <field> - <name>TRAFFIC AND BANDWIDTH</name> + <name>Traffic and Bandwidth</name> <type>listtopic</type> </field> <field> @@ -425,7 +425,7 @@ <type>input</type> </field> <field> - <name>ADVANCED CONFIGURATION</name> + <name>Advanced Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml index 05b5515a..594e7398 100644 --- a/config/freeradius2/freeradiusauthorizedmacs.xml +++ b/config/freeradius2/freeradiusauthorizedmacs.xml @@ -200,7 +200,7 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -227,13 +227,13 @@ <type>input</type> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> <fielddescr>Redirection URL</fielddescr> <fieldname>varmacsswisprredirectionurl</fieldname> - <description><![CDATA[Enter the URL the MAC should be redirected to after successfull login. (e.g.: http://www.google.com)]]></description> + <description><![CDATA[Enter the URL the MAC should be redirected to after successful login. (e.g.: http://www.google.com)]]></description> <type>input</type> </field> <field> @@ -250,7 +250,7 @@ <type>input</type> </field> <field> - <name>NETWORK CONFIGURATION</name> + <name>Network Configuration</name> <type>listtopic</type> </field> <field> @@ -287,7 +287,7 @@ <type>input</type> </field> <field> - <name>TIME CONFIGURATION</name> + <name>Time Configuration</name> <type>listtopic</type> </field> <field> @@ -331,7 +331,7 @@ </options> </field> <field> - <name>TRAFFIC AND BANDWIDTH</name> + <name>Traffic and Bandwidth</name> <type>listtopic</type> </field> <field> @@ -372,7 +372,7 @@ <type>input</type> </field> <field> - <name>ADVANCED CONFIGURATION</name> + <name>Advanced Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiuscerts.xml b/config/freeradius2/freeradiuscerts.xml index 6108215b..4909411a 100644 --- a/config/freeradius2/freeradiuscerts.xml +++ b/config/freeradius2/freeradiuscerts.xml @@ -98,7 +98,7 @@ </tabs> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiusclients.xml b/config/freeradius2/freeradiusclients.xml index 215a751e..4e66a597 100644 --- a/config/freeradius2/freeradiusclients.xml +++ b/config/freeradius2/freeradiusclients.xml @@ -132,13 +132,13 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> <fielddescr>Client IP Address</fielddescr> <fieldname>varclientip</fieldname> - <description><![CDATA[Enter the IP address of the client. This is in general the IP of the NAS (switch,accesspoint).]]></description> + <description><![CDATA[Enter the IP address of the RADIUS client. This is the IP of the NAS (switch, access point, firewall, router, etc.).]]></description> <type>input</type> <required/> </field> @@ -156,19 +156,19 @@ <field> <fielddescr>Client Shortname</fielddescr> <fieldname>varclientshortname</fieldname> - <description><![CDATA[Enter shortname of the client. This is in general the hostname of the NAS (switch,accesspoint).]]></description> + <description><![CDATA[Enter a short name for the client. This is generally the hostname of the NAS.]]></description> <type>input</type> <required/> </field> <field> <fielddescr>Client Shared Secret</fielddescr> <fieldname>varclientsharedsecret</fieldname> - <description><![CDATA[Enter the shared secret of the client here. This is the shared secret (password) which the NAS (switch or accesspoint) needs to communicate with the RADIUS server.]]></description> + <description><![CDATA[Enter the shared secret of the RADIUS client here. This is the shared secret (password) which the NAS (switch or accesspoint) needs to communicate with the RADIUS server.]]></description> <type>password</type> <required/> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiuseapconf.xml b/config/freeradius2/freeradiuseapconf.xml index 8f8e4dc7..947ef6b9 100644 --- a/config/freeradius2/freeradiuseapconf.xml +++ b/config/freeradius2/freeradiuseapconf.xml @@ -105,7 +105,7 @@ <field> <fielddescr>Disable weak EAP types</fielddescr> <fieldname>vareapconfdisableweakeaptypes</fieldname> - <description><![CDATA[Here you disable the weak EAP types MD5, GTC and LEAP. You should do this if you want that only stronger EAP types like TLS, TTLS, PEAP, MSCHAPv2 should be allowed. This option does not affect the "tunneled EAP sessions".]]></description> + <description><![CDATA[Here you can disable the weak EAP types MD5, GTC and LEAP. Check this to only allow stronger EAP types like TLS, TTLS, PEAP, MSCHAPv2 should be allowed. This option does not affect the "tunneled EAP sessions".]]></description> <type>checkbox</type> </field> <field> @@ -134,7 +134,7 @@ <field> <fielddescr>Ignore Unknown EAP Types</fielddescr> <fieldname>vareapconfignoreunknowneaptypes</fieldname> - <description><![CDATA[If the RADIUS does not know the EAP type it rejects it. If set to "yes" an other module <b>must</b> be configured to proxy the request to a further RADIUS server. (Default: no)]]></description> + <description><![CDATA[If the RADIUS server does not know the EAP type, it rejects it. If set to "yes" another module <b>must</b> be configured to proxy the request to a further RADIUS server. (Default: no)]]></description> <type>select</type> <default_value>no</default_value> <options> @@ -161,23 +161,23 @@ <default_value>4096</default_value> </field> <field> - <name>CERTIFICATES FOR TLS</name> + <name>Certificates for TLS</name> <type>listtopic</type> </field> <field> - <fielddescr>Choose Cert-Manager</fielddescr> + <fielddescr>Choose Cert Manager</fielddescr> <fieldname>vareapconfchoosecertmanager</fieldname> <description><![CDATA[Choose your Cert manager. By default it is the freeradius cert manager because the server needs some default certs to start service. For more information take al look at "Certificates"-Tab.<br> - To use the firewall's built-in Cert Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).<br><br> - <b>uncheked</b>: FreeRADIUS Cert-Manager (not recommended) (Default: unchecked)<br> - <b>cheked</b>: Firewall Cert-Manager (recommended)]]></description> + To use the firewall's built-in Certificate Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).<br><br> + <b>unchecked</b>: FreeRADIUS Cert Manager (not recommended) (Default: unchecked)<br> + <b>checked</b>: Firewall Cert Manager (recommended)]]></description> <type>checkbox</type> <enablefields>ssl_ca_cert,ssl_ca_crl,ssl_server_cert</enablefields> </field> <field> <fielddescr>Private Key Password</fielddescr> <fieldname>vareapconfprivatekeypassword</fieldname> - <description><![CDATA[By default the certificates created by freeradius are protected with an "input/ouput" password from reading the certificate. The certificates created by the firewall's built-in Cert Manager are not protected so you must leave this field empty. (Default: whatever)]]></description> + <description><![CDATA[By default the certificates created by freeradius are protected with an "input/ouput" password from reading the certificate. The certificates created by the firewall's built-in Cert Manager are not protected so you must leave this field empty.]]></description> <type>password</type> <default_value>whatever</default_value> </field> @@ -306,7 +306,7 @@ <field> - <name>EAP-TLS - ENABLE CACHE</name> + <name>EAP-TLS - Enable Cache</name> <type>listtopic</type> </field> <field> @@ -334,7 +334,7 @@ <field> <fielddescr>Max Entries</fielddescr> <fieldname>vareapconfcachemaxentries</fieldname> - <description><![CDATA[The maximum number of entries in the cache. Set to "0" for "infinite". This could be set to the number of users who are logged in... which can be a LOT. (Default: 255)]]></description> + <description><![CDATA[The maximum number of entries in the cache. Set to "0" for "infinite." (Default: 255)]]></description> <type>input</type> <default_value>255</default_value> </field> @@ -470,7 +470,7 @@ <field> <fielddescr>Microsoft Statement of Health (SoH) Support</fielddescr> <fieldname>vareapconfpeapsohenable</fieldname> - <description><![CDATA[You can accept/reject clients if they have not actual windows updates and more. You need to change server-file for your needs. It cannot be changed from GUI and will be deleted after package (re)installation. (/usr/local/etc/raddb/sites-available/soh). (Default: no)]]></description> + <description><![CDATA[You can accept/reject clients based on Microsoft's Statement of Health, such as if they are missing Windows updates, don't have a firewall enabled, antivirus not in line with policy, etc. You need to change server-file for your needs. It cannot be changed from GUI and will be deleted after package reinstallation. (/usr/local/etc/raddb/sites-available/soh). (Default: no)]]></description> <type>select</type> <default_value>Disable</default_value> <options> diff --git a/config/freeradius2/freeradiusinterfaces.xml b/config/freeradius2/freeradiusinterfaces.xml index 1233f72f..5427f988 100644 --- a/config/freeradius2/freeradiusinterfaces.xml +++ b/config/freeradius2/freeradiusinterfaces.xml @@ -120,7 +120,7 @@ </adddeleteeditpagefields> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -175,7 +175,7 @@ <field> <fielddescr>Description</fielddescr> <fieldname>description</fieldname> - <description><![CDATA[Enter any description you like for this interface.]]></description> + <description><![CDATA[Optionally enter a description here for your reference.]]></description> <type>input</type> </field> </fields> diff --git a/config/freeradius2/freeradiusmodulesldap.xml b/config/freeradius2/freeradiusmodulesldap.xml index 5abe85cb..e476b877 100644 --- a/config/freeradius2/freeradiusmodulesldap.xml +++ b/config/freeradius2/freeradiusmodulesldap.xml @@ -115,7 +115,7 @@ <type>checkbox</type> </field> <field> - <name>GENERAL CONFIGURATION - SERVER 1</name> + <name>General Configuration - SERVER 1</name> <type>listtopic</type> </field> <field> @@ -207,7 +207,7 @@ <default_value>1</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION - SERVER 1</name> + <name>Miscellaneous Configuration - SERVER 1</name> <type>listtopic</type> </field> <field> @@ -434,7 +434,7 @@ <type>checkbox</type> </field> <field> - <name>GENERAL CONFIGURATION - SERVER 2</name> + <name>General Configuration - SERVER 2</name> <type>listtopic</type> </field> <field> @@ -526,7 +526,7 @@ <default_value>1</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION - SERVER 2</name> + <name>Miscellaneous Configuration - SERVER 2</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiussettings.xml b/config/freeradius2/freeradiussettings.xml index 99af4d4a..78c65372 100644 --- a/config/freeradius2/freeradiussettings.xml +++ b/config/freeradius2/freeradiussettings.xml @@ -8,7 +8,8 @@ /* ========================================================================== */ /* freeradiussettings.xml - part of pfSense (http://www.pfSense.com) + part of pfSense (https://www.pfsense.org) + Copyright (C) 2014 Electric Sheep Fencing, LP Copyright (C) 2013 Alexander Wilke <nachtfalkeaw@web.de> All rights reserved. @@ -98,7 +99,7 @@ </tabs> <fields> <field> - <name>GENERAL CONFIGURATION</name> + <name>General Configuration</name> <type>listtopic</type> </field> <field> @@ -162,7 +163,7 @@ <field> <fielddescr>Logging Destination of RADIUS</fielddescr> <fieldname>varsettingslogdir</fieldname> - <description><![CDATA[Choose the destination where freeRADIUS should log. This will log if service started or failed but no authentication information. (Default: radius.log)]]></description> + <description><![CDATA[Choose the destination where freeRADIUS will log. This will log general service information, but no authentication information. (Default: radius.log)]]></description> <type>select</type> <default_value>syslog</default_value> <options> @@ -316,7 +317,7 @@ <field> <fielddescr>Enable Mobile-One-Time-Password</fielddescr> <fieldname>varsettingsmotpenable</fieldname> - <description><![CDATA[This enables the possibility to authenticate against an username and an one-time-password. The client which generates OTP can be installed on various mobile device plattforms like Android and more. (Default: unchecked)]]></description> + <description><![CDATA[This enables the possibility to authenticate using a username and one-time-password. The client which generates OTP can be installed on various mobile device plattforms like Android and more. (Default: unchecked)]]></description> <type>checkbox</type> <enablefields>varsettingsmotptimespan,varsettingsmotppasswordattempts,varsettingsmotpchecksumtype,varsettingsmotptokenlength</enablefields> </field> @@ -330,14 +331,14 @@ <field> <fielddescr>Number of invalid password attempts</fielddescr> <fieldname>varsettingsmotppasswordattempts</fieldname> - <description><![CDATA[After this the user will be locked out until the admin unlocks the user. (Default: 5)]]></description> + <description><![CDATA[After this many failed attempts, the user will be locked out until an admin unlocks the user. (Default: 5)]]></description> <type>input</type> <default_value>5</default_value> </field> <field> <fielddescr>Hash algorithm</fielddescr> <fieldname>varsettingsmotpchecksumtype</fieldname> - <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits as password. Perhaps there are some other/hardware tokens which use other hash types so you can perhaps adjust this here. But this <b>must</b> be equal on bothe sites! (Default: md5)]]></description> + <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits as password. Perhaps there are some other/hardware tokens which use other hash types so you can perhaps adjust this here. This <b>must</b> be equal on both sides! (Default: md5)]]></description> <type>select</type> <default_value>md5</default_value> <options> @@ -349,12 +350,12 @@ <field> <fielddescr>Token Password length</fielddescr> <fieldname>varsettingsmotptokenlength</fieldname> - <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits 1 to 6 as password. Perhaps there are some other/hardware tokens which use other digits so you can perhaps adjust this here. But this <b>must</b> be equal on bothe sites! (Default: 1-6)]]></description> + <description><![CDATA[We build a hash of "EPOCHTIME+INIT-SECRET+PIN" and then use the digits 1 to 6 as password. Perhaps there are some other/hardware tokens which use other digits so you can perhaps adjust this here. This <b>must</b> be equal on both sides! (Default: 1-6)]]></description> <type>input</type> <default_value>1-6</default_value> </field> <field> - <name>MISCELLANEOUS CONFIGURATION</name> + <name>Miscellaneous Configuration</name> <type>listtopic</type> </field> <field> diff --git a/config/freeradius2/freeradiussqlconf.xml b/config/freeradius2/freeradiussqlconf.xml index bb72a07a..f8f7ebc3 100644 --- a/config/freeradius2/freeradiussqlconf.xml +++ b/config/freeradius2/freeradiussqlconf.xml @@ -98,7 +98,7 @@ </tabs> <fields> <field> - <name>ENABLE SQL DATABASE - SERVER 1</name> + <name>Enable SQL Database- Server 1</name> <type>listtopic</type> </field> <field> @@ -117,7 +117,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -129,7 +129,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -141,7 +141,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -153,12 +153,12 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> <field> - <name>SQL DATABASE CONFIGURATION - SERVER 1</name> + <name>SQL Database Configuration - Server 1</name> <type>listtopic</type> </field> <field> @@ -331,7 +331,7 @@ <field> <fielddescr>Read Clients from Database</fielddescr> <fieldname>varsqlconfreadclients</fieldname> - <description><![CDATA[Set to <b>yes</b> to read radius clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> + <description><![CDATA[Set to <b>yes</b> to read RADIUS clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> <type>select</type> <default_value>yes</default_value> <options> @@ -347,7 +347,7 @@ <default_value>nas</default_value> </field> <field> - <name>ENABLE REDUNDANT SQL DATABASE SUPPORT</name> + <name>Enable Redundant SQL Database Support</name> <type>listtopic</type> </field> <field> @@ -366,7 +366,7 @@ </options> </field> <field> - <name>ENABLE SQL DATABASE - SERVER 2</name> + <name>Enable SQL Database - Server 2</name> <type>listtopic</type> </field> <field> @@ -385,7 +385,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -397,7 +397,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -409,7 +409,7 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> @@ -421,12 +421,12 @@ <type>select</type> <default_value>Disable</default_value> <options> - <option><name>Disbale</name><value>Disable</value></option> + <option><name>Disable</name><value>Disable</value></option> <option><name>Enable</name><value>Enable</value></option> </options> </field> <field> - <name>SQL DATABASE CONFIGURATION - SERVER 2</name> + <name>SQL Database Configuration - Server 2</name> <type>listtopic</type> </field> <field> @@ -599,7 +599,7 @@ <field> <fielddescr>Read Clients from Database</fielddescr> <fieldname>varsqlconf2readclients</fieldname> - <description><![CDATA[Set to <b>yes</b> to read radius clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> + <description><![CDATA[Set to <b>yes</b> to read RADIUS clients from the database ('nas' table). Clients will only be read on server startup. (Default: yes)]]></description> <type>select</type> <default_value>yes</default_value> <options> |