]>
Commit | Line | Data |
---|---|---|
1afa61a6 | 1 | diff -urN boa-0.93.16.1.orig/examples/boa.conf boa-0.93.16.1/examples/boa.conf |
ff223964 AM |
2 | --- boa-0.93.16.1.orig/examples/boa.conf Sat Aug 14 18:48:40 1999 |
3 | +++ boa-0.93.16.1/examples/boa.conf Sat Aug 14 18:51:40 1999 | |
944accd6 JR |
4 | @@ -24,8 +24,8 @@ |
5 | # User: The name or UID the server should run as. | |
6 | # Group: The group name or GID the server should run as. | |
7 | ||
8 | -User nobody | |
9 | -Group nogroup | |
10 | +User http | |
11 | +Group http | |
12 | ||
13 | # ServerAdmin: The email address where server problems should be sent. | |
14 | # Note: this is not currently used. | |
18bbd9d3 JR |
15 | @@ -36,28 +36,28 @@ |
16 | # with /, it is considered relative to the server root. | |
17 | # Set to /dev/null if you don't want errors logged. | |
18 | ||
19 | -ErrorLog /var/log/boa/error_log | |
20 | +ErrorLog /var/log/httpd/error_log | |
21 | ||
22 | # AccessLog: The location of the access log file. If this does not | |
23 | # start with /, it is considered relative to the server root. | |
24 | # Comment out or set to /dev/null (less effective) to disable | |
25 | # Access logging. | |
26 | ||
27 | -AccessLog /var/log/boa/access_log | |
28 | +AccessLog /var/log/httpd/access_log | |
29 | ||
30 | # RefererLog: The location of the referer log file. If this does not | |
31 | # start with /, it is considered relative to the server root. | |
32 | # Comment out or set to /dev/null (less effective) to disable | |
33 | # referer logging. | |
34 | ||
35 | -RefererLog /var/log/boa/referer_log | |
36 | +RefererLog /var/log/httpd/referer_log | |
37 | ||
38 | # AgentLog: The location of the agent log file. If this does not | |
39 | # start with /, it is considered relative to the server root. | |
40 | # Comment out or set to /dev/null (less effective) to disable | |
41 | # User-Agent logging. | |
42 | ||
43 | -AgentLog /var/log/boa/agent_log | |
44 | +AgentLog /var/log/httpd/agent_log | |
45 | ||
46 | # VerboseCGILogs: this is just a logical switch. | |
47 | # Comment out to disable. | |
944accd6 JR |
48 | @@ -72,7 +72,7 @@ |
49 | ||
50 | # DocumentRoot: The root directory of the HTML documents. | |
51 | ||
52 | -DocumentRoot /var/www | |
ff223964 | 53 | +DocumentRoot /home/httpd/html |
944accd6 JR |
54 | |
55 | # ChRoot: Boa root '/' directory. This is useful to improve security of | |
56 | # your system. Don't forget that ALL DIRECTORIES used by boa except logs | |
57 | @@ -93,12 +93,12 @@ | |
58 | ||
59 | DirectoryIndex index.html | |
60 | ||
61 | -DirectoryMaker /usr/local/sbin/boa_indexer | |
62 | +DirectoryMaker /usr/sbin/boa_indexer | |
63 | ||
64 | # LocalCodepage: Local codepage. This is send to client in 'Content-Type:' | |
65 | # header by default. | |
66 | ||
67 | -#LocalCodepage iso-8859-1 | |
68 | +#LocalCodepage iso-8859-2 | |
69 | ||
70 | # Codepage: Load codepage conversion table from file. This table will be used | |
71 | # on-the-fly conversion. | |
72 | @@ -161,7 +161,7 @@ | |
73 | # ScriptAlias: Maps a virtual path to a directory for serving scripts | |
74 | # Example: ScriptAlias /htbin/ /www/htbin/ | |
75 | ||
76 | -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ | |
f0dafed8 | 77 | +ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/ |
944accd6 JR |
78 | |
79 | # VirtualHost: Maps a virtual host to a directory. | |
80 | # Example: VirtualHost cz.boa.org /html/htdocs/boa/ | |
1afa61a6 | 81 | diff -urN boa-0.93.16.1.orig/src/Makefile.in boa-0.93.16.1/src/Makefile.in |
ff223964 AM |
82 | --- boa-0.93.16.1.orig/src/Makefile.in Sat Aug 14 18:48:40 1999 |
83 | +++ boa-0.93.16.1/src/Makefile.in Sat Aug 14 18:48:45 1999 | |
1afa61a6 AM |
84 | @@ -9,16 +9,13 @@ |
85 | ||
86 | # Add -DNO_DAEMON if you do not want the server to fork upon launch | |
87 | LDFLAGS = @LIBS@ | |
88 | -CFLAGS = -O | |
89 | +CFLAGS = $(RPM_OPT_FLAGS) | |
90 | ||
91 | MANDIR = /usr/local/man | |
92 | BINDIR = /usr/local/sbin | |
93 | ||
94 | # FreeBSD's make doesn't like `ifdef`, but likes `.ifdef` | |
95 | -ifdef INET6 | |
96 | -LDFLAGS += -L/usr/inet6/lib -linet6 | |
97 | -CFLAGS += -DINET6 -I/usr/inet6/include | |
98 | -endif | |
99 | +CFLAGS += -DINET6 | |
100 | ||
101 | # Change these if necessary | |
102 | ||
103 | diff -urN boa-0.93.16.1.orig/src/defines.h boa-0.93.16.1/src/defines.h | |
ff223964 AM |
104 | --- boa-0.93.16.1.orig/src/defines.h Sat Aug 14 18:48:40 1999 |
105 | +++ boa-0.93.16.1/src/defines.h Sat Aug 14 18:48:45 1999 | |
944accd6 JR |
106 | @@ -26,7 +26,7 @@ |
107 | /***** Change this, or use -c on the command line to specify it *****/ | |
108 | ||
109 | #ifndef SERVER_ROOT | |
110 | -#define SERVER_ROOT "/etc/boa" | |
ff223964 | 111 | +#define SERVER_ROOT "/etc/httpd" |
944accd6 JR |
112 | #endif |
113 | ||
114 | /***** Logs *****************************************************************/ | |
115 | @@ -41,7 +41,7 @@ | |
116 | #define USE_NLS 1 | |
117 | #define USE_NLS_REFERER_REDIR 1 | |
118 | #define USE_CHARSET_HEADER 1 | |
119 | -#define DEFAULT_CHARSET "iso-8859-1" | |
120 | +#define DEFAULT_CHARSET "iso-8859-2" | |
121 | ||
122 | /****** Authorization ******************************************************/ | |
123 | ||
1afa61a6 | 124 | diff -urN boa-0.93.16.1.orig/util/Makefile boa-0.93.16.1/util/Makefile |
ff223964 AM |
125 | --- boa-0.93.16.1.orig/util/Makefile Sat Aug 14 18:48:40 1999 |
126 | +++ boa-0.93.16.1/util/Makefile Sat Aug 14 18:48:45 1999 | |
33c21d7d JR |
127 | @@ -4,10 +4,10 @@ |
128 | rm cpsel cp-test | |
129 | ||
130 | cpsel: cpsel.c cpsel.config.h | |
131 | - gcc -o cpsel cpsel.c | |
132 | + gcc $(RPM_OPT_FLAGS) -o cpsel cpsel.c | |
133 | ||
134 | cp-test: cp-test.c | |
135 | - gcc -o cp-test cp-test.c | |
136 | + gcc $(RPM_OPT_FLAGS) -o cp-test cp-test.c | |
137 | ||
138 | boa_indexer: index_dir.c | |
139 | - gcc -o boa_indexer index_dir.c | |
140 | + gcc $(RPM_OPT_FLAGS) -o boa_indexer index_dir.c | |
1afa61a6 | 141 | diff -urN boa-0.93.16.1.orig/util/resolver.pl boa-0.93.16.1/util/resolver.pl |
ff223964 AM |
142 | --- boa-0.93.16.1.orig/util/resolver.pl Sat Aug 14 18:48:40 1999 |
143 | +++ boa-0.93.16.1/util/resolver.pl Sat Aug 14 18:48:45 1999 | |
1afa61a6 AM |
144 | @@ -1,10 +1,10 @@ |
145 | -#!/usr/local/bin/perl | |
146 | +#!/usr/bin/perl | |
147 | ||
148 | # IP address resolver for Boa | |
149 | ||
150 | # If you want an "in place" change to the log file, | |
151 | # change the first line to | |
152 | -#!/usr/local/bin/perl -i.bak | |
153 | +#!/usr/bin/perl -i.bak | |
154 | # Otherwise, send the output of this program wherever you want: | |
155 | # resolver.pl access_log >access_log_resolved | |
156 |