summaryrefslogtreecommitdiff
path: root/www/apache13-fp/files/patch-aa
blob: 093d8391c0e851c5b14d3c0f432d17763aae9400 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
--- configure.orig	Sat Aug 14 03:29:05 1999
+++ configure	Sat Oct 16 20:49:14 1999
@@ -1084,10 +1084,10 @@
 ##  UID/GID as production oriented as a web server in NIS anyway.
 ##
 conf_user="nobody"
-conf_group="#-1"
+conf_group="nogroup"
 conf_port="80"
 conf_serveradmin="you@your.address"
-conf_servername="new.host.name"
+conf_servername="`$aux/buildinfo.sh -n %h%d`"
 if [ "x$confadjust" = "x1" ]; then
     if [ -f /etc/passwd ]; then
         for uid in nobody www daemon demon http httpd; do 
@@ -1107,7 +1107,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
  
 ##
@@ -1153,8 +1156,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"
@@ -1244,8 +1247,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