]>
Commit | Line | Data |
---|---|---|
f36fc9f9 | 1 | diff -ur bircd.orig/Config bircd/Config |
2 | --- bircd.orig/Config 2004-05-30 11:30:52.000000000 +0200 | |
3 | +++ bircd/Config 2004-08-02 18:42:02.274674232 +0200 | |
4 | @@ -46,19 +46,19 @@ | |
5 | DEFLIBS="none" | |
6 | OSNAME="an unrecgonized operating system" | |
7 | # | |
8 | -DPATH="/usr/local/etc/ircd" | |
9 | -SPATH="/usr/local/bin/ircd" | |
10 | -BPATH="/usr/local/bin" | |
11 | -SET_UID=1 | |
12 | -SET_GID=1 | |
13 | -HUB="" | |
14 | +DPATH="/etc/ircd" | |
15 | +SPATH="/usr/sbin/ircd" | |
16 | +BPATH="/usr/sbin" | |
17 | +SET_UID=75 | |
18 | +SET_GID=75 | |
19 | +HUB="Yes" | |
20 | LISTEN_SIZE="5" | |
21 | MAXSENDQLENGTH="3000000" | |
22 | BUFFERPOOL="(10 * MAXSENDQLENGTH)" | |
23 | NICKNAMEHISTORYLENGTH="2000" | |
24 | UNIXPORT="" | |
25 | USE_POLL="" | |
26 | -MAXCONNECTIONS="128" | |
27 | +MAXCONNECTIONS="512" | |
28 | FD_SETSIZE="" | |
29 | ||
30 | # | |
31 | @@ -76,8 +76,6 @@ | |
32 | n='-n' | |
33 | fi | |
34 | ||
35 | -clear | |
36 | - | |
37 | if [ "$1" = "-m" ]; then | |
38 | AUTO_CONFIG="" | |
39 | fi | |
40 | @@ -895,16 +893,18 @@ | |
41 | echo "#endif" >> $SETUP_H | |
42 | ||
43 | FOO="" | |
44 | +runonce="" | |
45 | while [ -z "$FOO" ] ; do | |
46 | - if [ "$USER" = "root" ]; then | |
47 | - FOO="$DPATH" | |
48 | - else | |
49 | - FOO="${HOME}/ircd" | |
50 | - fi | |
51 | + FOO="$DPATH" | |
52 | echo "" | |
53 | echo "What directory are all the server configuration files in?" | |
54 | echo $n "[$FOO] -> $c" | |
55 | - read cc | |
56 | + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then | |
57 | + read cc | |
58 | + else | |
59 | + cc="" | |
60 | + runonce=Yes | |
61 | + fi | |
62 | if [ -z "$cc" ] ; then | |
63 | cc=$FOO | |
64 | fi | |
65 | @@ -915,16 +915,18 @@ | |
66 | rm -f Makefile.tmp | |
67 | ||
68 | FOO="" | |
69 | +runonce="" | |
70 | while [ -z "$FOO" ] ; do | |
71 | - if [ "$USER" = "root" ]; then | |
72 | - FOO="$BPATH" | |
73 | - else | |
74 | - FOO="${HOME}/ircd" | |
75 | - fi | |
76 | + FOO="$BPATH" | |
77 | echo "" | |
78 | echo "What directory is the ircd binary file in?" | |
79 | echo $n "[$FOO] -> $c" | |
80 | - read cc | |
81 | + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then | |
82 | + read cc | |
83 | + else | |
84 | + cc="" | |
85 | + runonce=Yes | |
86 | + fi | |
87 | if [ -z "$cc" ] ; then | |
88 | cc=$FOO | |
89 | fi | |
90 | @@ -973,7 +975,12 @@ | |
91 | echo "" | |
92 | echo "Are you running as a HUB?" | |
93 | echo $n "[$FOO] -> $c" | |
94 | - read cc | |
95 | + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then | |
96 | + read cc | |
97 | + else | |
98 | + cc="" | |
99 | + runonce=Yes | |
100 | + fi | |
101 | if [ -z "$cc" ] ; then | |
102 | cc=$FOO | |
103 | fi | |
104 | @@ -1166,7 +1173,12 @@ | |
105 | echo "If you aren't sure, answer NO. select() will be used instead." | |
106 | echo "Use poll() for non-blocking I/O?" | |
107 | echo $n "[$FOO] -> $c" | |
108 | + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then | |
109 | read cc | |
110 | + else | |
111 | + cc="" | |
112 | + runonce=Yes | |
113 | + fi | |
114 | if [ -z "$cc" ] ; then | |
115 | cc=$FOO | |
116 | fi | |
117 | @@ -1194,7 +1206,12 @@ | |
118 | echo "How many file descriptors (or sockets) can the irc server use?" | |
119 | echo "(This value should be the multiply of 64)" | |
120 | echo $n "[$FOO] -> $c" | |
121 | - read cc | |
122 | + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then | |
123 | + read cc | |
124 | + else | |
125 | + cc="" | |
126 | + runonce=Yes | |
127 | + fi | |
128 | if [ -z "$cc" ] ; then | |
129 | cc=$FOO | |
130 | fi | |
131 | @@ -1330,10 +1347,8 @@ | |
132 | #define NICKNAMEHISTORYLENGTH $NICKNAMEHISTORYLENGTH | |
133 | __EOF__ | |
134 | ||
135 | -if [ "$USER" = "root" ]; then | |
136 | - echo "#define SET_UID $SET_UID" >> $OPTIONS_H | |
137 | - echo "#define SET_GID $SET_GID" >> $OPTIONS_H | |
138 | -fi | |
139 | +echo "#define SET_UID $SET_UID" >> $OPTIONS_H | |
140 | +echo "#define SET_GID $SET_GID" >> $OPTIONS_H | |
141 | ||
142 | if [ -n "$USE_POLL" ]; then | |
143 | echo "#define USE_POLL" >> $OPTIONS_H | |
144 | diff -ur bircd.orig/doc/example.conf bircd/doc/example.conf | |
145 | --- bircd.orig/doc/example.conf 2004-02-21 17:45:02.000000000 +0100 | |
146 | +++ bircd/doc/example.conf 2004-08-02 18:35:44.241144064 +0200 | |
147 | @@ -13,13 +13,16 @@ | |
148 | # I line says who is allowed to connect, this one allows everyone | |
149 | I:*::::10 | |
150 | ||
151 | +# IPv6 addresses may be used in this file like in example below | |
152 | +#I:[2001:1234::/48]::::10 | |
153 | + | |
154 | # IRCop line type /oper <nick> <Pass> to get power | |
155 | -O:*@192.168.0.4:pass:admin:ao:8 | |
156 | +O:*@127.0.0.1:pass:admin:ao:8 | |
157 | ||
158 | # N/C/H Lines are what you use when you link. | |
159 | -N:192.168.0.1:pass:irc.hub::110 | |
160 | -C:192.168.0.1:pass:irc.hub:7325:110 | |
161 | -H:*::irc.hub | |
162 | +#N:192.168.0.1:pass:irc.hub::110 | |
163 | +#C:192.168.0.1:pass:irc.hub:7325:110 | |
164 | +#H:*::irc.hub | |
165 | ||
166 | # P lines are the port lines these say what ports can be used | |
167 | P:*:::6667 | |
168 | diff -ur bircd.orig/include/config.h bircd/include/config.h | |
169 | --- bircd.orig/include/config.h 2004-05-30 11:31:46.000000000 +0200 | |
170 | +++ bircd/include/config.h 2004-08-02 18:58:33.666959696 +0200 | |
171 | @@ -37,7 +37,7 @@ | |
172 | ** | |
173 | ** Define this to enable IPv6 support. | |
174 | */ | |
175 | -//#define INET6 | |
176 | +#define INET6 | |
177 | ||
178 | /* NO_DEFAULT_INVISIBLE | |
179 | ** | |
180 | @@ -77,7 +77,7 @@ | |
181 | ** Define it to have extra logging to users.log, opers.log and rejects.log | |
182 | ** Function is fuzzy and I dont recommend to use it. -- Borg | |
183 | */ | |
184 | -//#define LOGGING | |
185 | +#define LOGGING | |
186 | ||
187 | /* NO_DNS | |
188 | ** | |
189 | @@ -221,15 +221,15 @@ | |
190 | * You must define these to something, even if you don't really want them. | |
191 | */ | |
192 | #ifndef DPATH | |
193 | -#define DPATH "." /* dir where all ircd stuff is */ | |
194 | +#define DPATH "/var/lib/ircd" /* dir where all ircd stuff is */ | |
195 | #endif | |
196 | #ifndef SPATH | |
197 | -#define SPATH "." /* path to server executeable */ | |
198 | +#define SPATH "/usr/sbin/ircd" /* path to server executeable */ | |
199 | #endif | |
200 | -#define CPATH "ircd.conf" /* server configuration file */ | |
201 | -#define MPATH "ircd.motd" /* server MOTD file */ | |
202 | -#define LPATH "debug.log" /* Where the debug file lives, if DEBUGMODE */ | |
203 | -#define PPATH "ircd.pid" /* file for server pid */ | |
204 | +#define CPATH "/etc/ircd/ircd.conf" /* server configuration file */ | |
205 | +#define MPATH "/etc/ircd/ircd.motd" /* server MOTD file */ | |
206 | +#define LPATH "/var/log/ircd/debug.log" /* Where the debug file lives, if DEBUGMODE */ | |
207 | +#define PPATH "/var/lib/ircd/ircd.pid" /* file for server pid */ | |
208 | ||
209 | /* | |
210 | * Define this filename to maintain a list of persons who log | |
211 | @@ -239,9 +239,9 @@ | |
212 | * successful use of /oper. FNAME_CONNLOG logs all rejected connections. | |
213 | * These are either full paths or files within DPATH. | |
214 | */ | |
215 | -#define FNAME_USERLOG "users.log" | |
216 | -#define FNAME_OPERLOG "opers.log" | |
217 | -#define FNAME_CONNLOG "rejects.log" | |
218 | +#define FNAME_USERLOG "/var/log/ircd/users.log" | |
219 | +#define FNAME_OPERLOG "/var/log/ircd/opers.log" | |
220 | +#define FNAME_CONNLOG "/var/log/ircd/rejects.log" | |
221 | ||
222 | ||
223 | /* CHROOTDIR |