[blfs-book] r9382 - in trunk/BOOK: . general/prog introduction/welcome networking/netprogs postlfs/security server/mail server/major server/other

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sat Feb 11 20:47:35 PST 2012


Author: bdubbs
Date: 2012-02-11 21:47:30 -0700 (Sat, 11 Feb 2012)
New Revision: 9382

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/cvsserver.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/networking/netprogs/inetutils.xml
   trunk/BOOK/networking/netprogs/samba3.xml
   trunk/BOOK/postlfs/security/mitkrb.xml
   trunk/BOOK/postlfs/security/tcpwrappers.xml
   trunk/BOOK/server/mail/qpopper.xml
   trunk/BOOK/server/major/major.xml
   trunk/BOOK/server/major/proftpd.xml
   trunk/BOOK/server/major/vsftpd.xml
   trunk/BOOK/server/other/leafnode.xml
Log:
Remove xinetd

Modified: trunk/BOOK/general/prog/cvsserver.xml
===================================================================
--- trunk/BOOK/general/prog/cvsserver.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/general/prog/cvsserver.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -124,7 +124,7 @@
 
     <para>Issue a <command>killall -HUP inetd</command> to reread the changed
     <filename>inetd.conf</filename> file.</para>
-
+<!--
     <para>If you use <command>xinetd</command>, the following command will create
     the CVS file as <filename>/etc/xinetd.d/cvspserver</filename>:</para>
 
@@ -140,7 +140,7 @@
           user        = root
           passenv     = PATH
           server      = /usr/bin/cvs
-          server_args = -f --allow-root=/srv/cvsroot pserver
+          server_args = -f - -allow-root=/srv/cvsroot pserver
      }
 
 # End /etc/xinetd.d/cvspserver</literal>
@@ -152,7 +152,7 @@
 
     <para>Issue a <command>/etc/rc.d/init.d/xinetd reload</command> to reread
     the changed <filename>xinetd.conf</filename> file.</para>
-
+-->
     <para>Testing anonymous access to the new repository requires an account
     on another machine that can reach the CVS server via network. No account
     on the CVS repository is needed. To test anonymous access to the CVS

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/general.ent	2012-02-12 04:47:30 UTC (rev 9382)
@@ -536,7 +536,7 @@
 <!ENTITY proftpd-version              "1.3.0">
 <!-- samba3 (chapter 14) -->
 <!ENTITY vsftpd-version               "2.3.4">
-<!ENTITY xinetd-version               "2.3.14">
+<!-- <!ENTITY xinetd-version               "2.3.14"> -->
 
 <!-- Chapter 20 -->
 <!ENTITY exim-version                 "4.67">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -45,6 +45,9 @@
       <para>February 12th, 2012</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Remove xinetd. </para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update ca-cert scripts.  Account for 
           changed upstream format and ensure date command works
           for all systems.</para>

Modified: trunk/BOOK/networking/netprogs/inetutils.xml
===================================================================
--- trunk/BOOK/networking/netprogs/inetutils.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/networking/netprogs/inetutils.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -206,8 +206,8 @@
       <varlistentry id="inetd">
         <term><command>inetd</command></term>
         <listitem>
-          <para>is an Internet super-server. Note that the <xref linkend="xinetd"/>
-          package provides a much better server that does the same thing.</para>
+          <para>is an Internet super-server. <!-- Note that the <xref linkend="xinetd"/>
+          package provides a much better server that does the same thing.--></para>
           <indexterm zone="inetutils inetd">
             <primary sortas="b-inetd">inetd</primary>
           </indexterm>

Modified: trunk/BOOK/networking/netprogs/samba3.xml
===================================================================
--- trunk/BOOK/networking/netprogs/samba3.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/networking/netprogs/samba3.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -515,7 +515,7 @@
         http://localhost:905.</para>
         
       </sect4>
-
+<!--
       <sect4>
         <title>Setting up SWAT using xinetd</title>
 
@@ -571,7 +571,7 @@
         http://localhost:905.</para>
 
       </sect4>
-
+-->
       <sect4>
         <title>Setting up SWAT using stunnel</title>
 

Modified: trunk/BOOK/postlfs/security/mitkrb.xml
===================================================================
--- trunk/BOOK/postlfs/security/mitkrb.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/postlfs/security/mitkrb.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -411,7 +411,7 @@
         <command>kshd</command>) requires two additional configuration steps.
         First the <filename>/etc/services</filename> file must be updated to
         include eklogin and krb5_prop. Second, the
-        <filename>inetd.conf</filename> or <filename>xinetd.conf</filename>
+        <filename>inetd.conf</filename> <!--or <filename>xinetd.conf</filename>--> file
         must be modified for each server that will be activated, usually
         replacing the server from <xref linkend="inetutils"/>.</para>
 

Modified: trunk/BOOK/postlfs/security/tcpwrappers.xml
===================================================================
--- trunk/BOOK/postlfs/security/tcpwrappers.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/postlfs/security/tcpwrappers.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -137,7 +137,7 @@
       <note>
         <para>The <command>finger</command> server is used as an example here.</para>
       </note>
-
+<!--
       <para>Similar changes must be made if <application>xinetd</application> is
       used, with the emphasis being on calling <command>/usr/sbin/tcpd</command>
       instead of calling the service daemon directly, and passing the name of the
@@ -146,7 +146,7 @@
       <indexterm zone="tcpwrappers tcpwrappers-config">
         <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
       </indexterm>
-
+-->
     </sect3>
 
   </sect2>

Modified: trunk/BOOK/server/mail/qpopper.xml
===================================================================
--- trunk/BOOK/server/mail/qpopper.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/server/mail/qpopper.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -172,7 +172,7 @@
 
       <para>Issue a <command>killall -HUP inetd</command> to reread the
       changed <filename>inetd.conf</filename> file.</para>
-
+<!--
       <para>If you use <command>xinetd</command>, the following command will
       create the <application>Qpopper</application> file as
       <filename>/etc/xinetd.d/pop3</filename>:</para>
@@ -203,7 +203,7 @@
 
       <para>Issue a <command>killall -HUP xinetd</command> to reread the
       changed <filename>xinetd.conf</filename> file.</para>
-
+-->
     </sect3>
 
   </sect2>

Modified: trunk/BOOK/server/major/major.xml
===================================================================
--- trunk/BOOK/server/major/major.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/server/major/major.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -25,6 +25,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/> -->
 
 </chapter>

Modified: trunk/BOOK/server/major/proftpd.xml
===================================================================
--- trunk/BOOK/server/major/proftpd.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/server/major/proftpd.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -183,7 +183,7 @@
 # at once, simply increase this value.  Note that this ONLY works
 # in standalone mode, in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
-# (such as xinetd)
+<!--# (such as xinetd)-->
 MaxInstances                    30
 
 # Set the user and group that the server normally runs at.

Modified: trunk/BOOK/server/major/vsftpd.xml
===================================================================
--- trunk/BOOK/server/major/vsftpd.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/server/major/vsftpd.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -163,8 +163,8 @@
       <filename class='directory'>/etc</filename> above. While still as
       <systemitem class="username">root</systemitem>, this file should be
       modified because it is now recommended to run <command>vsftpd</command>
-      in standalone mode as opposed to
-      <command>inetd</command>/<command>xinetd</command> mode. Also, you
+      in standalone mode. <!-- as opposed to
+      <command>inetd</command>/<command>xinetd</command> mode. -->Also, you
       should specify the privilege separation user created above. Finally,
       you should specify the <command>chroot</command> directory.
       <command>man vsftpd.conf</command> will give you all the details.</para>

Modified: trunk/BOOK/server/other/leafnode.xml
===================================================================
--- trunk/BOOK/server/other/leafnode.xml	2012-02-12 04:17:41 UTC (rev 9381)
+++ trunk/BOOK/server/other/leafnode.xml	2012-02-12 04:47:30 UTC (rev 9382)
@@ -61,8 +61,10 @@
     <xref linkend="tcpwrappers"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="xinetd"/> and
-    <xref linkend="fcron"/></para>
+    <para role="recommended">
+      <!-- <xref linkend="xinetd"/> and -->
+      <xref linkend="fcron"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/leafnode"/></para>
@@ -121,8 +123,8 @@
       <filename>/etc/nntpserver</filename>,
       <filename>/etc/sysconfig/createfiles</filename>
       <filename>/etc/inetd.conf</filename> or
-      <filename>/etc/xinetd.conf</filename> or
-      <filename>/etc/xinetd.d/nntp</filename></para>
+      <!-- <filename>/etc/xinetd.conf</filename> or
+      <filename>/etc/xinetd.d/nntp</filename>--></para>
 
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-leafnode-config">/etc/leafnode/config</primary>
@@ -131,11 +133,11 @@
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-nntpserver">/etc/nntpserver</primary>
       </indexterm>
-
+<!--
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
       </indexterm>
-
+-->
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
       </indexterm>
@@ -143,11 +145,11 @@
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
       </indexterm>
-
+<!--
       <indexterm zone="leafnode leafnode-config">
         <primary sortas="e-etc-xinetd.d-nntp">/etc/xinetd.d/nntp</primary>
       </indexterm>
-
+-->
     </sect3>
 
     <sect3>
@@ -194,7 +196,7 @@
 
       <para>Issue a <command>killall -HUP inetd</command> to reread the
       changed <filename>inetd.conf</filename> file.</para>
-
+<!--
       <para>If you use <command>xinetd</command>, the following command will
       create the <application>Leafnode</application> file as
       <filename>/etc/xinetd.d/nntp</filename>:</para>
@@ -220,7 +222,7 @@
 
       <para>Issue a <command>killall -HUP xinetd</command> to reread the
       changed <filename>xinetd.conf</filename> file.</para>
-
+-->
       <para>Add entries to the <systemitem class="username">root</systemitem>
       or <systemitem class="username">news</systemitem> user's crontab to run
       the <command>fetchnews</command> and <command>texpire</command> commands




More information about the blfs-book mailing list