You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/18 22:15:35 UTC
svn commit: r605328 - in /httpd/mod_ftp/trunk: Makefile.apxs
build/mkconfNW.awk configure.apxs docs/conf/extra/ftpd.conf
Author: wrowe
Date: Tue Dec 18 13:15:34 2007
New Revision: 605328
URL: http://svn.apache.org/viewvc?rev=605328&view=rev
Log:
Catch up to Gunter's work on variable substitutions.
note one change, rel_logfiledir, not exp_logfiledir. exp gets too wordy.
Modified:
httpd/mod_ftp/trunk/Makefile.apxs
httpd/mod_ftp/trunk/build/mkconfNW.awk
httpd/mod_ftp/trunk/configure.apxs
httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf
Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=605328&r1=605327&r2=605328&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Tue Dec 18 13:15:34 2007
@@ -29,6 +29,7 @@
# Dang nabbit, these are stripped! Reconsitute them;
rel_libexecdir=`echo $(exp_libexecdir) | sed -e "s#^$(prefix)/##;"`
rel_sysconfdir=`echo $(exp_sysconfdir) | sed -e "s#^$(prefix)/##;"`
+rel_logfiledir=`echo $(exp_logfiledir) | sed -e "s#^$(prefix)/##;"`
httpd_conffile=$(exp_sysconfdir)/$(progname).conf
exp_ftpdocsdir=$(exp_datadir)/ftpdocs
@@ -43,8 +44,13 @@
cd $$j ; \
for i in extra/ftpd*.conf; do \
if test -f $$i; then \
- sed -e 's#@exp_ftpdocsdir@#$(exp_ftpdocsdir)#g' \
- -e 's#@@FTPPort@@#$(FTPPORT)#g' \
+ sed -e 's#@exp_ftpdocsdir@#$(exp_ftpdocsdir)#;' \
+ -e 's#@exp_runtimedir@#$(exp_runtimedir)#;' \
+ -e 's#@exp_expconfdir@#$(rel_sysconfdir)#;' \
+ -e 's#@rel_sysconfdir@#$(rel_sysconfdir)#;' \
+ -e 's#@rel_logfiledir@#$(rel_logfiledir)#;' \
+ -e 's#\#@@LoadFtpModules@@##;' \
+ -e 's#@@FTPPort@@#$(FTPPORT)#;' \
< $$i > $(exp_sysconfdir)/original/$$i; \
chmod 0644 $(exp_sysconfdir)/original/$$i; \
if test ! -f $(exp_sysconfdir)/$$i; then \
Modified: httpd/mod_ftp/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/mkconfNW.awk?rev=605328&r1=605327&r2=605328&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/mkconfNW.awk (original)
+++ httpd/mod_ftp/trunk/build/mkconfNW.awk Tue Dec 18 13:15:34 2007
@@ -23,7 +23,8 @@
A["sysconfdir"] = "conf"
B["ftpdocsdir"] = A["ServerRoot"]"/"A["ftpdocsdir"]
-
+ B["sysconfdir"] = A["ServerRoot"]"/"A["sysconfdir"]
+ B["runtimedir"] = A["ServerRoot"]"/"A["runtimedir"]
}
/#@@LoadFtpModules@@/ {
Modified: httpd/mod_ftp/trunk/configure.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/configure.apxs?rev=605328&r1=605327&r2=605328&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/configure.apxs (original)
+++ httpd/mod_ftp/trunk/configure.apxs Tue Dec 18 13:15:34 2007
@@ -37,6 +37,7 @@
rel_fix_prefix=`$APXS -q prefix`
rel_libexecdir=`$APXS -q exp_libexecdir | sed -e "s#^$rel_fix_prefix/##;"`
rel_sysconfdir=`$APXS -q exp_sysconfdir | sed -e "s#^$rel_fix_prefix/##;"`
+rel_logfiledir=`$APXS -q exp_logfiledir | sed -e "s#^$rel_fix_prefix/##;"`
httpd_conffile=`$APXS -q exp_sysconfdir`/`$APXS -q progname`.conf
exp_ftpdocsdir=`$APXS -q exp_datadir`/ftpdocs
@@ -54,6 +55,7 @@
-e "s#^\(builddir\)=.*#\1=$builddir$l_r#;" \
-e "s#^\(rel_libexecdir\)=.*#\1=$rel_libexecdir#;" \
-e "s#^\(rel_sysconfdir\)=.*#\1=$rel_sysconfdir#;" \
+ -e "s#^\(rel_logfiledir\)=.*#\1=$rel_logfiledir#;" \
-e "s#^\(httpd_conffile\)=.*#\1=$httpd_conffile#;" \
-e "s#^\(exp_ftpdocsdir\)=.*#\1=$exp_ftpdocsdir#;" \
-e "s#^\(FTPPORT\)=.*#\1=$FTPPORT#;" \
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=605328&r1=605327&r2=605328&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf (original)
+++ httpd/mod_ftp/trunk/docs/conf/extra/ftpd.conf Tue Dec 18 13:15:34 2007
@@ -135,7 +135,7 @@
#########################################################################
# Setup the error_log for this virtualhost.
-ErrorLog "@exp_logfiledir@/ftp_error_log"
+ErrorLog "@rel_logfiledir@/ftp_error_log"
# Define the formats for the command log and transfer log
#
@@ -169,14 +169,14 @@
# Log the commands of users logged in anonymously.
# SetEnvIf remote_user anonymous do_command_log
-# CustomLog "@exp_logfiledir@/ftp_command_log" command_log_fmt env=do_command_log
+# CustomLog "@rel_logfiledir@/ftp_command_log" command_log_fmt env=do_command_log
#
# Log the command of all users
-# CustomLog "@exp_logfiledir@/ftp_command_log command_log_fmt"
+# CustomLog "@rel_logfiledir@/ftp_command_log command_log_fmt"
# The transfer log.
#
-# CustomLog "@exp_logfiledir@/ftp_transfer_log" transfer_log_fmt env=do_transfer_log
+# CustomLog "@rel_logfiledir@/ftp_transfer_log" transfer_log_fmt env=do_transfer_log
#########################################################################
# SSL Support
@@ -186,7 +186,7 @@
# Adding SSL support to the FTP module is similar to adding support for
# SSL to the HTTP module.
-# SSLLog "@exp_logfiledir@/ssl_engine_log"
+# SSLLog "@rel_logfiledir@/ssl_engine_log"
# SSLLogLevel info
# SSLEngine on