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