svn commit: r604377 - in /httpd/mod_ftp/trunk/docs: conf/extra/ftpd.conf ftproot/

[wr...@apache.org]

Author: wrowe
Date: Fri Dec 14 18:47:58 2007
New Revision: 604377

URL: http://svn.apache.org/viewvc?rev=604377&view=rev
Log:
Enable some substitution, and add ftproot (same function as docroot
for example ftpdocsdir contents).


Added:
    httpd/mod_ftp/trunk/docs/ftproot/
Modified:
    httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf

Modified: httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf?rev=604377&r1=604376&r2=604377&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf (original)
+++ httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf Fri Dec 14 18:47:58 2007
@@ -6,22 +6,15 @@
 # Basic setup
 #########################################################################
 
-# Load the main FTP module
-LoadModule ftp_module modules/mod_ftp.so
-
-# Load any extension modules we may have.
-<IfModule mod_ftp.c>
-LoadModule ftp_cmd_pwd_module modules/mod_ftp_cmd_pwd.so
-</IfModule>
-
 # Tell Apache which port it should listen to.
-Listen 8021 ftp
+Listen @@FTPPort@@ ftp
 AcceptFilter ftp none
 
 # On Apache 2.0, comment out the above, and uncomment the line below,
-# The Listen's protocol argument and AcceptFilter are new to Apache 2.2
+# The Listen's protocol argument and AcceptFilter directive are both
+# new to Apache 2.2
 #
-# Listen 8021
+#Listen @@FTPPort@@
 
 # Uncomment these lines for SSL support.  Also see
 # directives in the VirtualHost context.
@@ -32,7 +25,7 @@
 # SSLMutex                file:logs/ssl_mutex
 
 # Setup the FTP virtualhost
-<VirtualHost _default_:8021>
+<VirtualHost _default_:@@FTPPort@@>
 
 # Setup the ServerAdmin and DocumentRoot
 ServerAdmin  admin@ftp.example.com