47 lines
2.3 KiB
Plaintext
47 lines
2.3 KiB
Plaintext
--- configure.orig Mon Jan 17 16:53:17 2000
|
|
+++ configure Sun Feb 20 15:43:26 2000
|
|
@@ -1151,7 +1151,8 @@
|
|
conf_port="80"
|
|
fi
|
|
conf_serveradmin="you@your.address"
|
|
-conf_servername="new.host.name"
|
|
+conf_servername="`$aux/buildinfo.sh -n %h%d`"
|
|
+#conf_servername="new.host.name"
|
|
if [ "x$confadjust" = "x1" ]; then
|
|
if [ -f /etc/passwd ]; then
|
|
if [ "x$conf_user" = "x" ]; then
|
|
@@ -1175,7 +1176,10 @@
|
|
conf_port="8080"
|
|
fi
|
|
conf_serveradmin="`$aux/buildinfo.sh -n %u@%h%d`"
|
|
- conf_servername="`$aux/buildinfo.sh -n %h%d`"
|
|
+# conf_servername="`$aux/buildinfo.sh -n %h%d`"
|
|
+fi
|
|
+if [ ".$suexec" = .1 ]; then
|
|
+ conf_user="$suexec_caller"
|
|
fi
|
|
|
|
##
|
|
@@ -1232,8 +1236,8 @@
|
|
echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
|
|
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
|
|
echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
|
|
- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
|
|
- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
|
|
+ echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
|
|
+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
|
|
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
|
|
echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
|
|
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
|
|
@@ -1330,8 +1334,8 @@
|
|
echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
|
|
echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
|
|
echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
|
|
-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
|
|
-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
|
|
+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
|
|
+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
|
|
echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
|
|
echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
|
|
echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
|