svn commit: r605172 - in /httpd/mod_ftp/trunk: build/mkconfNW.awk docs/conf/extra/ftpd.conf

[fu...@apache.org]

Author: fuankg
Date: Tue Dec 18 02:37:13 2007
New Revision: 605172

URL: http://svn.apache.org/viewvc?rev=605172&view=rev
Log:
changed fixed paths to placeholders for easier replacement by scripts.

Modified:
    httpd/mod_ftp/trunk/build/mkconfNW.awk
    httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf

Modified: httpd/mod_ftp/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/mkconfNW.awk?rev=605172&r1=605171&r2=605172&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/mkconfNW.awk (original)
+++ httpd/mod_ftp/trunk/build/mkconfNW.awk Tue Dec 18 02:37:13 2007
@@ -19,15 +19,15 @@
     A["FTPPort"] = FTPPORT
     A["ftpdocsdir"] = FTPROOT
     A["logfiledir"] = "logs"
+    A["runtimedir"] = "logs"
     A["sysconfdir"] = "conf"
 
     B["ftpdocsdir"] = A["ServerRoot"]"/"A["ftpdocsdir"]
 
 }
 
-/#@@LoadModule@@/ {
+/#@@LoadFtpModules@@/ {
     print "LoadModule ftp_module modules/mod_ftp.nlm"
-    print "#LoadModule ftp_cmd_pwd_module modules/ftpcmdpwd.nlm"
     next
 }
 

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=605172&r1=605171&r2=605172&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf (original)
+++ httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf Tue Dec 18 02:37:13 2007
@@ -2,7 +2,7 @@
 # Sample configuration file for the FTP protocol module.
 #########################################################################
 
-#@@LoadModule@@
+#@@LoadFtpModules@@
 
 #########################################################################
 # Basic setup
@@ -22,9 +22,10 @@
 # directives in the VirtualHost context.
 #
 # SSLPassPhraseDialog     builtin
-# SSLSessionCache         dbm:logs/ssl_scache
+# SSLSessionCache         "dbm:@exp_runtimedir@/ssl_scache"
+# SSLSessionCache         "shmcb:@exp_runtimedir@/ssl_scache(512000)"
 # SSLSessionCacheTimeout  300
-# SSLMutex                file:logs/ssl_mutex
+# SSLMutex                "file:@exp_runtimedir@/ssl_mutex"
 
 # Setup the FTP virtualhost
 <VirtualHost _default_:@@FTPPort@@>
@@ -134,7 +135,7 @@
 #########################################################################
 
 # Setup the error_log for this virtualhost.
-ErrorLog     logs/ftp_error_log
+ErrorLog     "@exp_logfiledir@/ftp_error_log"
 
 # Define the formats for the command log and transfer log
 #
@@ -168,14 +169,14 @@
 
 # Log the commands of users logged in anonymously.
 # SetEnvIf remote_user anonymous do_command_log
-# CustomLog logs/ftp_command_log command_log_fmt env=do_command_log
+# CustomLog "@exp_logfiledir@/ftp_command_log" command_log_fmt env=do_command_log
 #
 # Log the command of all users
-# CustomLog logs/ftp_command_log command_log_fmt
+# CustomLog "@exp_logfiledir@/ftp_command_log command_log_fmt"
 
 # The transfer log.
 #
-# CustomLog logs/ftp_transfer_log transfer_log_fmt env=do_transfer_log
+# CustomLog "@exp_logfiledir@/ftp_transfer_log" transfer_log_fmt env=do_transfer_log
 
 #########################################################################
 # SSL Support
@@ -185,13 +186,13 @@
 # Adding SSL support to the FTP module is similar to adding support for
 # SSL to the HTTP module.
 
-# SSLLog      logs/ssl_engine_log
+# SSLLog      "@exp_logfiledir@/ssl_engine_log"
 # SSLLogLevel info
 
 # SSLEngine on
 # SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-# SSLCertificateFile /path/to/server.cert
-# SSLCertificateKeyFile /path/to/server.key
+# SSLCertificateFile "@exp_sysconfdir@/server.crt"
+# SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
 
 #
 # Should clients be forced to connect securely?