diff -uNrd old/fq-ircd-1.2d/CHANGES fq-ircd-1.2d/CHANGES --- old/fq-ircd-1.2d/CHANGES 2004-03-31 20:58:49.000000000 +0200 +++ fq-ircd-1.2d/CHANGES 2004-04-01 00:16:58.000000000 +0200 @@ -5,6 +5,9 @@ * Server Admins (+A) can now see +s/+p channels on /LIST (Thanks Doc!) * Changed /LIST to /FQLIST and added a message which tells the user that /LIST is deprecated and /FQLIST should be used instead +* Got "make distclean" to remove ircdssl.rnd +* Fixed so "make install" doesn't overwrite chkircd +* Renamed ircd.chk to chkircd - v1.2c * Opers can now evade +b/+i/+k/+l channelmodes. Added for managing diff -uNrd old/fq-ircd-1.2d/include/config.h fq-ircd-1.2d/include/config.h --- old/fq-ircd-1.2d/include/config.h 2004-03-31 21:03:54.000000000 +0200 +++ fq-ircd-1.2d/include/config.h 2004-04-01 00:14:01.000000000 +0200 @@ -274,7 +274,7 @@ #define PPATH "ircd.pid" #define HPATH "opers.txt" #define MKPATH "mkpasswd" - +#define CHKPATH "chkircd" /* Services Definitions */ #define STATS_NAME "stats.freequest.net" diff -uNrd old/fq-ircd-1.2d/tools/chkircd fq-ircd-1.2d/tools/chkircd --- old/fq-ircd-1.2d/tools/chkircd 1970-01-01 01:00:00.000000000 +0100 +++ fq-ircd-1.2d/tools/chkircd 2004-04-01 00:18:12.000000000 +0200 @@ -0,0 +1,44 @@ +#!/bin/sh + +# chkircd - Originaly by tillberg +# This documentation is made by ph0x +# Distributed with fq-ircd, but may be used with other +# ircd's or for other purposes. +# +# This line would be good to use with crontab +# */1 * * * * /path/to/chkircd >/dev/null 2>&1 +# + +# Set this to the dir where you have installed your ircd +servdir="/path/to/ircd/dir" + +# What is the name of your ircd you? +servstart="name-of-ircd-binary" + +# Name of configfile? +configfile="config.file" + +# Where are your pidfile located? +pid="/path/to/ircd/pidfile" + + +cd $servdir +echo "Checking if ircd is up" +if test -r $pid; then + # there is a pid file -- is it current? + ircpid=`cat $pid` + echo "Checking pid $ircpid - up?" + if `kill -CHLD $ircpid >/dev/null 2>&1`; then + # it's still going + # back out quietly + echo "Yes, it's running" + exit 0 + fi + echo "" + echo "Stale $pid file (erasing it)" + rm -f $pid +fi +echo "" +echo "Couldn't find the server running. Reloading it..." +echo "" +$servstart -f $configfile diff -uNrd old/fq-ircd-1.2d/tools/install_ircd fq-ircd-1.2d/tools/install_ircd --- old/fq-ircd-1.2d/tools/install_ircd 2004-03-31 20:19:12.000000000 +0200 +++ fq-ircd-1.2d/tools/install_ircd 2004-04-01 00:12:48.000000000 +0200 @@ -18,6 +18,7 @@ PPATH=`grep '#define.PPATH' include/config.h|awk '{print $3}'|tr -d \"`; HPATH=`grep '#define.HPATH' include/config.h|awk '{print $3}'|tr -d \"`; MKPATH=`grep '#define.MKPATH' include/config.h|awk '{print $3}'|tr -d \"`; +CHKPATH=`grep '#define.CHKPATH' include/config.h|awk '{print $3}'|tr -d \"`; base_SPATH=`basename $SPATH`; base_CPATH=`basename $CPATH`; @@ -27,6 +28,7 @@ base_PPATH=`basename $PPATH`; base_HPATH=`basename $HPATH`; base_MKPATH=`basename $MKPATH`; +base_CHKPATH=`basename $CHKPATH`; # DPATH = directory, # SPATH = server executable, @@ -36,6 +38,7 @@ # leave KPATH undefined if you want klines in main conf file # HPATH is the opers help file, seen by opers on /quote help # MKPATH is where mkpasswd will be stored +# CHKPATH is where chkircd will be stored if [ ! -d ${DPATH} ] ; then echo Creating ${DPATH}; @@ -89,14 +92,22 @@ fi; -# try to install ircd.chk, else install a new version of it -if [ ! -f {$DPATH}ircd.chk ] ; then - echo installing ircd.chk as your ${DPATH}ircd.chk; - ./install-sh -c tools/ircd.chk ${DPATH}ircd.chk; +# try to install their chkircd, unless it already exists. + +if [ $base_CHKPATH = $CHKPATH ] ; then + if [ ! -f ${DPATH}${CHKPATH} ] ; then + echo installing chkircd as your ${DPATH}${CHKPATH}; + ./install-sh -c tools/chkircd ${DPATH}${CHKPATH}; + else + echo You already have an ${DPATH}${CHKPATH}....; + fi; else - echo You already have an ${DPATH}ircd.chk file...; - echo Installing ircd.chk to ${DPATH}ircd.chk.new; - ./install-sh -c tools/ircd.chk ${DPATH}ircd.chk.new + if [ ! -f $CHKPATH ] ; then + echo installing chkircd as your ${CHKPATH}; + ./install-sh -c tools/chkircd $CHKPATH; + else + echo You already have an ${CHKPATH} file...; + fi; fi; diff -uNrd old/fq-ircd-1.2d/tools/ircd.chk fq-ircd-1.2d/tools/ircd.chk --- old/fq-ircd-1.2d/tools/ircd.chk 2004-03-31 20:19:12.000000000 +0200 +++ fq-ircd-1.2d/tools/ircd.chk 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -#!/bin/sh - -# ircd.chk - Originaly by tillberg -# This documentation is made by ph0x -# Distributed with fq-ircd, but may be used with other -# ircd's or for other purposes. -# -# This line would be good to use with crontab -# */1 * * * * /path/to/ircd.chk >/dev/null 2>&1 -# - -# Set this to the dir where you have installed your ircd -servdir="/path/to/ircd/dir" - -# What is the name of your ircd you? -servstart="name-of-ircd-binary" - -# Name of configfile? -configfile="config.file" - -# Where are your pidfile located? -pid="/path/to/ircd/pidfile" - - -cd $servdir -echo "Checking if ircd is up" -if test -r $pid; then - # there is a pid file -- is it current? - ircpid=`cat $pid` - echo "Checking pid $ircpid - up?" - if `kill -CHLD $ircpid >/dev/null 2>&1`; then - # it's still going - # back out quietly - echo "Yes, it's running" - exit 0 - fi - echo "" - echo "Stale $pid file (erasing it)" - rm -f $pid -fi -echo "" -echo "Couldn't find the server running. Reloading it..." -echo "" -$servstart -f $configfile