From: <eob...@us...> - 2009-03-28 19:49:56
|
Revision: 2646 http://ipcop.svn.sourceforge.net/ipcop/?rev=2646&view=rev Author: eoberlander Date: 2009-03-28 19:49:52 +0000 (Sat, 28 Mar 2009) Log Message: ----------- Update DHCP section. Modified Paths: -------------- IPCopDoc/trunk/en/admin/images/blueaccess.png IPCopDoc/trunk/en/admin/images/dhcp-dynamic.png IPCopDoc/trunk/en/admin/images/dhcp.png IPCopDoc/trunk/en/admin/images/time.png IPCopDoc/trunk/en/admin/images/time2.png IPCopDoc/trunk/en/admin/xml/info.xml IPCopDoc/trunk/en/admin/xml/services.xml Modified: IPCopDoc/trunk/en/admin/images/blueaccess.png =================================================================== (Binary files differ) Modified: IPCopDoc/trunk/en/admin/images/dhcp-dynamic.png =================================================================== (Binary files differ) Modified: IPCopDoc/trunk/en/admin/images/dhcp.png =================================================================== (Binary files differ) Modified: IPCopDoc/trunk/en/admin/images/time.png =================================================================== (Binary files differ) Modified: IPCopDoc/trunk/en/admin/images/time2.png =================================================================== (Binary files differ) Modified: IPCopDoc/trunk/en/admin/xml/info.xml =================================================================== --- IPCopDoc/trunk/en/admin/xml/info.xml 2009-03-28 19:32:25 UTC (rev 2645) +++ IPCopDoc/trunk/en/admin/xml/info.xml 2009-03-28 19:49:52 UTC (rev 2646) @@ -410,7 +410,7 @@ <title>Current Dynamic Leases</title> <para> Displays the contents of the - <filename>/var/state/dhcp/dhcpd.leases</filename> + <filename>/var/run/dnsmasq/dnsmasq.leases</filename> file if DHCP is enabled. The current dynamic leases are listed, with hostnames if available, and expiry dates. </para> Modified: IPCopDoc/trunk/en/admin/xml/services.xml =================================================================== --- IPCopDoc/trunk/en/admin/xml/services.xml 2009-03-28 19:32:25 UTC (rev 2645) +++ IPCopDoc/trunk/en/admin/xml/services.xml 2009-03-28 19:49:52 UTC (rev 2646) @@ -14,13 +14,36 @@ </para><para> These are: <itemizedlist> - <listitem><para><link linkend="services_webproxy">Proxy</link> (Web Proxy Server)</para></listitem> - <listitem><para><link linkend="services_dhcp">DHCP Server</link></para></listitem> - <listitem><para><link linkend="services_dyndns">Dynamic DNS Management</link></para></listitem> - <listitem><para><link linkend="services_hosts">Edit Hosts</link> (Local DNS Server)</para></listitem> - <listitem><para><link linkend="services_time">Time Server</link></para></listitem> - <listitem><para><link linkend="services_shaping">Traffic Shaping</link></para></listitem> - <listitem><para><link linkend="services_ids">Intrusion Detection System</link></para></listitem> + <listitem> + <para><link linkend="services_webproxy"><guimenuitem>Proxy</guimenuitem></link> + (Web Proxy Server) + </para> + </listitem> + <listitem> + <para><link linkend="services_dhcp"><guimenuitem>DHCP Server</guimenuitem></link> + </para> + </listitem> + <listitem> + <para><link linkend="services_dyndns"><guimenuitem>Dynamic DNS Management</guimenuitem></link> + </para> + </listitem> + <listitem> + <para><link linkend="services_hosts"><guimenuitem>Edit Hosts</guimenuitem></link> + (Local DNS Server) + </para> + </listitem> + <listitem> + <para><link linkend="services_time"><guimenuitem>Time Server</guimenuitem></link> + </para> + </listitem> + <listitem> + <para><link linkend="services_shaping"><guimenuitem>Traffic Shaping</guimenuitem></link> + </para> + </listitem> + <listitem> + <para><link linkend="services_ids"><guimenuitem>Intrusion Detection System</guimenuitem></link> + </para> + </listitem> </itemizedlist> In a larger network it is likely that these services will be provided by dedicated servers and should be disabled here. @@ -59,7 +82,7 @@ </screenshot> </para><para> You can choose if you want to proxy requests from your Green (private) network - and/or your Blue (wireless) network. Just tick the relevant boxes. + and/or your Blue (wireless) network (if fitted). Just tick the relevant boxes. </para> <formalpara> <title><guilabel>Log enabled</guilabel></title> @@ -190,7 +213,7 @@ </para> <para> You can choose if you want to provide this service to your Green (private) network - and/or your Blue (wireless) network. Just tick the relevant box. + and/or your Blue (wireless) network (if installed). Just tick the relevant box. </para><para> For a full explanation of DHCP you may want to read Linux Magazine's <ulink url="http://www.linux-mag.com/2000-04/networknirvana_01.html"> @@ -221,8 +244,8 @@ <title><guilabel>Start Address</guilabel> (optional)</title> <para> You can specify the lowest and highest addresses that the server will hand out to - other requestors. The default is to hand out all the addresses within the subnet you set - up when you installed IPCop. If you have machines on your network that do not use + other requestors. + If you have machines on your network that do not use DHCP, and have their IP addresses set manually, you should set the start and end address so that the server will not hand out any of these manual IPs. </para> @@ -247,17 +270,6 @@ </para> </note> <formalpara> - <title><guilabel>Base IP for fixed lease creation</guilabel> (optional)</title> - <para> - The ability to add fixed leases from the list of dynamic - leases was added in v1.4.12. - </para> - </formalpara> - <para> - You can specify an IP Address which will be used as the base - from which new fixed leases will be incremented. - </para> - <formalpara> <title><guilabel>Default lease time</guilabel></title> <para> This can be left at its default value unless you @@ -274,21 +286,6 @@ </para> </formalpara> <formalpara> - <title><guilabel>Maximum lease time</guilabel></title> - <para> - This can be left at its default value unless you - need to specify your own value. - The maximum lease time is the time interval during - which the DHCP server will always honor client - renewal requests for their current IP addresses. - After the maximum lease time, client IP addresses - may be changed by the server. - If the dynamic IP address range has changed, the - server will hand out an IP address in the new - dynamic range. - </para> - </formalpara> - <formalpara> <title><guilabel>Domain name suffix</guilabel> (optional)</title> <para> There should not be a leading period in this box. @@ -382,6 +379,7 @@ When you press <guibutton>Save</guibutton>, the change is acted upon. </para> </sect3> +<!-- section now redundant? <sect3 id="dhcp_options"> <title>Additional DHCP Options</title> <para> @@ -500,6 +498,7 @@ </para> </note> </sect3> +--> <sect3 id="add_dhcp_lease"> <title>Fixed Leases</title> <para> @@ -651,7 +650,7 @@ <para> If DHCP is enabled, this section lists the dynamic leases contained in the - <filename>/var/state/dhcp/dhcpd.leases</filename> file. + <filename>/var/run/dnsmasq/dnsmasq.leases</filename> file. The IP Address, MAC Address, hostname (if available) and lease expiry time of each record are shown, sorted by IP Address. @@ -667,7 +666,7 @@ section, if needed. </para> <para> - <figure id="v140.services.004"> + <figure id="v190.services.004"> <title>Current dynamic leases</title> <mediaobject> <imageobject role="fo"> @@ -687,14 +686,6 @@ </figure> </para> <para> - A new method of adding fixed leases from the list of dynamic - leases was added in v1.4.12. Used in conjunction with the - <emphasis>Base IP for fixed lease creation</emphasis> field, you - can select one or more checkboxes, and click the - <guibutton>Create fixed leases</guibutton> button to quickly add - a number of devices to the fixed lease list. - </para> - <para> Lease times that have already expired are <quote>struck through</quote>. </para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |