Merge pull request #123 from Nachtfalkeaw/master

freeRADIUS2 - new GUI, additional code, new features, IPv6 support

1 files changed, 113 insertions, 91 deletions

diff --git a/config/freeradius2/freeradiussettings.xml b/config/freeradius2/freeradiussettings.xml
index 0ea8ae50..bab82e72 100755
--- a/config/freeradius2/freeradiussettings.xml
+++ b/config/freeradius2/freeradiussettings.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+		<copyright>
+		<![CDATA[
 /* $Id$ */
 /* ========================================================================== */
 /*
@@ -40,136 +40,158 @@
     POSSIBILITY OF SUCH DAMAGE.
                                                                               */
 /* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+		]]>
+	</copyright>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
 	<name>freeradiussettings</name>
 	<version>none</version>
 	<title>FreeRADIUS: Settings</title>
 	<aftersaveredirect>pkg_edit.php?xml=freeradiussettings.xml&amp;id=0</aftersaveredirect>
 	<include_file>/usr/local/pkg/freeradius.inc</include_file>
 	<tabs>
-                <tab>
-                        <text>Users</text>
-                        <url>/pkg.php?xml=freeradius.xml</url>
-                </tab>
-                <tab>
-                        <text>Clients</text>
-                        <url>/pkg.php?xml=freeradiusclients.xml</url>
-                </tab>
-                <tab>
-                        <text>Settings</text>
-                        <url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=0</url>
+		<tab>
+			<text>Users</text>
+			<url>/pkg.php?xml=freeradius.xml</url>
+		</tab>
+		<tab>
+			<text>NAS / Clients</text>
+			<url>/pkg.php?xml=freeradiusclients.xml</url>
+		</tab>
+		<tab>
+			<text>Interfaces</text>
+			<url>/pkg.php?xml=freeradiusinterfaces.xml</url>
+		</tab>
+		<tab>
+			<text>Settings</text>
+			<url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=0</url>
 			<active/>
-                </tab>
-        </tabs>
+		</tab>
+	</tabs>
 	<fields>
 		<field>
-			<fielddescr>Listening Interface(s)</fielddescr>
-			<fieldname>interface_ip</fieldname>
-			<description>Enter the desired listening interface IP here ( 192.168.1.0 ) or use "*" (without "") for any interface.</description>
-			<type>input</type>
-			<default_value>*</default_value>
-			<required/>
+			<fielddescr>Logging Destination of RADIUS</fielddescr>
+			<fieldname>varsettingslogdir</fieldname>
+			<description>Choose the destination where freeRADIUS should log. Logging must be enabled.(Default: radius.log)</description>
+			<type>select</type>
+			<default_value>files</default_value>
+					<options>
+						<option><name>/var/log/radius.log</name><value>files</value></option>
+						<option><name>System Logs -> System</name><value>syslog</value></option>
+						<option><name>stdout</name><value>stdout</value></option>
+						<option><name>stderr</name><value>stderr</value></option>
+					</options>
 		</field>
 		<field>
-			<fielddescr>Port</fielddescr>
-			<fieldname>port</fieldname>
-			<description>Enter the port the RADIUS server will listen on. Leave blank to default to the system default, i.e., 1812.</description>
-			<type>input</type>
-			<default_value>1812</default_value>
+			<fielddescr>RADIUS Logging</fielddescr>
+			<fieldname>varsettingsauth</fieldname>
+			<description>Choose if you want to enable logging. (Default: Disabled)</description>
+			<type>select</type>
+			<default_value>no</default_value>
+					<options>
+						<option><name>Disable</name><value>no</value></option>
+						<option><name>Enable</name><value>yes</value></option>
+					</options>
+		</field>
+		<field>
+			<fielddescr>Log Bad Authentication Attempts</fielddescr>
+			<fieldname>varsettingsauthbadpass</fieldname>
+			<description>Choose if you want to log bad authentication attempts. Logging must be enabled. (Default: no)</description>
+			<type>select</type>
+			<default_value>no</default_value>
+					<options>
+						<option><name>no</name><value>no</value></option>
+						<option><name>Log</name><value>yes</value></option>
+					</options>
+		</field>
+		<field>
+			<fielddescr>Log good authentication attempts?</fielddescr>
+			<fieldname>varsettingsauthgoodpass</fieldname>
+			<description>Choose if you want to log good authentication attempts. Logging must be enabled. (Default: no)</description>
+			<type>select</type>
+			<default_value>no</default_value>
+					<options>
+						<option><name>no</name><value>no</value></option>
+						<option><name>Log</name><value>yes</value></option>
+					</options>
 		</field>
 		<field>
-			<fielddescr>Maximum requests server</fielddescr>
-			<fieldname>max_requests_var</fieldname>
-			<description>The maximum number of requests the RADIUS server can handle. Default is 1024. It should be 256 * number of clients e.g.: 4 Switches * 256 = 1024.</description>
+			<fielddescr>Log Stripped Names</fielddescr>
+			<fieldname>varsettingsstrippednames</fieldname>
+			<description>Choose if you want to log the full User-Name attribute as it was found in the request. Logging must be enabled. (Default: no)</description>
+			<type>select</type>
+			<default_value>no</default_value>
+					<options>
+						<option><name>no</name><value>no</value></option>
+						<option><name>Log</name><value>yes</value></option>
+					</options>
+		</field>		
+		<field>
+			<fielddescr>Maximum Requests Server</fielddescr>
+			<fieldname>varsettingsmaxrequests</fieldname>
+			<description>The maximum number of requests the server could handle at a time until "Cleanup Delay" deletes them. Useful range 256 * NAS. If it is set to low it will make the server busy. A higher value is better (but increased RAM usage) but it shouldn't be higher than 1000 * NAS. (Default: 1024)</description>
 			<type>input</type>
 			<default_value>1024</default_value>
 		</field>
 		<field>
-			<fielddescr>Max request time</fielddescr>
-			<fieldname>max_request_time_var</fieldname>
-			<description>The maximum time (in seconds) to handle a request. Default is 30. Useful range of values: 5 to 120.</description>
+			<fielddescr>Max Request Timeout</fielddescr>
+			<fieldname>varsettingsmaxrequesttime</fieldname>
+			<description>The maximum time to handle a request in seconds. (Default: 30)</description>
 			<type>input</type>
 			<default_value>30</default_value>
 		</field>
 		<field>
-			<fielddescr>Cleanup delay</fielddescr>
-			<fieldname>cleanup_delay_var</fieldname>
-			<description>The time to wait (in seconds) before cleaning up a reply which was sent to the NAS. Default is 5. Useful range of values: 2 to 10.</description>
+			<fielddescr>Cleanup Delay</fielddescr>
+			<fieldname>varsettingscleanupdelay</fieldname>
+			<description>The time to wait before cleaning up a reply which was sent to the NAS in seconds. (Default: 5)</description>
 			<type>input</type>
 			<default_value>5</default_value>
 		</field>
 		<field>
-			<fielddescr>Radius Logging Destination</fielddescr>
-			<fieldname>logdir_var</fieldname>
-			<description>Logging to "syslog" or "/var/log/radius.log" ?</description>
+			<fielddescr>NAS Hostname Lookup</fielddescr>
+			<fieldname>varsettingshostnamelookups</fieldname>
+			<description>Log the names of NAS instead of IP addresses. Turning this on can result in lock ups of the RADIUS Server. (Default: no)</description>
 			<type>select</type>
-			<default_value>/var/log</default_value>
+			<default_value>no</default_value>
 					<options>
-						<option>
-						<name>radius.log</name>
-						<value>files</value>
-						</option>
-						<option>
-						<name>syslog</name>
-						<value>syslog</value>
-						</option>
+						<option><name>Disable</name><value>no</value></option>
+						<option><name>Enable</name><value>yes</value></option>
 					</options>
-		</field>		
+		</field>
 		<field>
-			<fielddescr>Radius Logging</fielddescr>
-			<fieldname>radiuslogging</fieldname>
-			<description>Enable logging?</description>
+			<fielddescr>Allow Core Dumps</fielddescr>
+			<fieldname>varsettingsallowcoredumps</fieldname>
+			<description>Only turn this on if you need to debug the RADIUS server! (Default: no)</description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
-						<option>
-						<name>no</name>
-						<value>no</value>
-						</option>
-						<option>
-						<name>yes</name>
-						<value>yes</value>
-						</option>
+						<option><name>Disable</name><value>no</value></option>
+						<option><name>Enable</name><value>yes</value></option>
 					</options>
-		</field>
+		</field>		
 		<field>
-			<fielddescr>Log bad authentication attempts?</fielddescr>
-			<fieldname>radiuslogbadpass</fieldname>
-			<description>Specifies whether to log bad authentication attempts to the radius.log file. Radius Logging must be enabled for this to work.</description>
+			<fielddescr>Regular Expressions</fielddescr>
+			<fieldname>varsettingsregularexpressions</fieldname>
+			<description>Allows regular expressions. (Default: yes)</description>
 			<type>select</type>
-			<default_value>no</default_value>
+			<default_value>yes</default_value>
 					<options>
-						<option>
-						<name>no</name>
-						<value>no</value>
-						</option>
-						<option>
-						<name>yes</name>
-						<value>yes</value>
-						</option>
+						<option><name>Disable</name><value>no</value></option>
+						<option><name>Enable</name><value>yes</value></option>
 					</options>
 		</field>
 		<field>
-			<fielddescr>Log good authentication attempts?</fielddescr>
-			<fieldname>radiusloggoodpass</fieldname>
-			<description>Specifies whether to log good authentication attempts to the radius.log file. Radius Logging must be enabled for this to work.</description>
+			<fielddescr>Extended Expressions</fielddescr>
+			<fieldname>varsettingsextendedexpressions</fieldname>
+			<description>Allows extended expressions. (Default: yes)</description>
 			<type>select</type>
-			<default_value>no</default_value>
+			<default_value>yes</default_value>
 					<options>
-						<option>
-						<name>no</name>
-						<value>no</value>
-						</option>
-						<option>
-						<name>yes</name>
-						<value>yes</value>
-						</option>
+						<option><name>Disable</name><value>no</value></option>
+						<option><name>Enable</name><value>yes</value></option>
 					</options>
-		</field>
+		</field>		
 	</fields>
 	<custom_delete_php_command>
 		freeradius_settings_resync();
@@ -177,4 +199,4 @@
 	<custom_php_resync_config_command>
 		freeradius_settings_resync();
 	</custom_php_resync_config_command>
-</packagegui>
+</packagegui>
\ No newline at end of file