1 diff -ur bircd.orig/Config bircd/Config
2 --- bircd.orig/Config 2005-06-12 10:15:30.000000000 +0200
3 +++ bircd/Config 2005-07-28 14:52:04.891190416 +0200
6 OSNAME="an unrecgonized operating system"
8 -DPATH="/usr/local/etc/ircd"
9 -SPATH="/usr/local/bin/ircd"
10 -BPATH="/usr/local/bin"
15 +SPATH="/usr/sbin/ircd"
21 CRYPT_SALT1="0xefcdab89"
22 CRYPT_SALT2="0x98badcfe"
24 NICKNAMEHISTORYLENGTH="2000"
38 if [ "$1" = "-m" ]; then
42 echo "#endif" >> $SETUP_H
46 while [ -z "$FOO" ] ; do
47 - if [ "$USER" = "root" ]; then
54 echo "What directory are all the server configuration files in?"
55 echo $n "[$FOO] -> $c"
57 + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then
63 if [ -z "$cc" ] ; then
71 while [ -z "$FOO" ] ; do
72 - if [ "$USER" = "root" ]; then
79 echo "What directory is the ircd binary file in?"
80 echo $n "[$FOO] -> $c"
82 + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then
88 if [ -z "$cc" ] ; then
93 echo "Are you running as a HUB?"
94 echo $n "[$FOO] -> $c"
96 + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then
102 if [ -z "$cc" ] ; then
105 @@ -1007,7 +1014,12 @@
107 echo "Encrypt O-Line password in ircd.conf?"
108 echo $n "[$FOO] -> $c"
110 + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then
116 if [ -z "$cc" ] ; then
119 @@ -1199,7 +1211,12 @@
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
129 if [ -z "$cc" ] ; then
132 @@ -1227,7 +1244,12 @@
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"
137 + if [ -z "$AUTO_CONFIG" -o -n "$runonce" ] ; then
143 if [ -z "$cc" ] ; then
146 @@ -1363,10 +1385,8 @@
147 #define NICKNAMEHISTORYLENGTH $NICKNAMEHISTORYLENGTH
150 -if [ "$USER" = "root" ]; then
151 - echo "#define SET_UID $SET_UID" >> $OPTIONS_H
152 - echo "#define SET_GID $SET_GID" >> $OPTIONS_H
154 +echo "#define SET_UID $SET_UID" >> $OPTIONS_H
155 +echo "#define SET_GID $SET_GID" >> $OPTIONS_H
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
161 +++ bircd/doc/example.conf 2005-07-28 14:49:40.331166880 +0200
163 # I line says who is allowed to connect, this one allows everyone
166 +# IPv6 addresses may be used in this file like in example below
167 +#I:[2001:1234::/48]::::10
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
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
177 +#N:192.168.0.1:pass:irc.hub::110
178 +#C:192.168.0.1:pass:irc.hub:7325:110
181 # P lines are the port lines these say what ports can be used
183 diff -ur bircd.orig/include/config.h bircd/include/config.h
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
188 ** Define this to enable IPv6 support.
193 /* NO_DEFAULT_INVISIBLE
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
204 @@ -221,15 +221,15 @@
205 * You must define these to something, even if you don't really want them.
208 -#define DPATH "." /* dir where all ircd stuff is */
209 +#define DPATH "/var/lib/ircd" /* dir where all ircd stuff is */
212 -#define SPATH "." /* path to server executeable */
213 +#define SPATH "/usr/sbin/ircd" /* path to server executeable */
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 */
225 * Define this filename to maintain a list of persons who log
227 * successful use of /oper. FNAME_CONNLOG logs all rejected connections.
228 * These are either full paths or files within DPATH.
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"