Added some netsplit handling stuff (untested)

[user/henk/code/inspircd.git] / makeconf

diff --git a/makeconf b/makeconf
index 7df9226bc85425e6e03a937332fe2195a8182441..70ffa45957cc8a481a509d54758230c23cfcfb3c 100755 (executable)
--- a/makeconf
+++ b/makeconf
@@ -11,12 +11,6 @@
 
 echo "Configuring Default Values"
 
-PERL=`which perl`
-if [ "$PERL" = "" ] ; then
-        echo "You require perl to run this program."
-        exit;
-fi
-
 ME=`pwd`
 SERV_NAME="my.server.name"
 SERV_DESC="My InspIRCd Server"
@@ -44,7 +38,7 @@ FILES_MOTD="$ME/conf/inspire.motd"
 FILES_RULE="$ME/conf/inspire.rules"
 
 OP_PREFIX="Quit: "
-OP_DEBUG="off"
+OP_DEBUG="default"
 OP_HALFY="yes"
 OP_PROTE="yes"
 OP_FOUND="yes"
@@ -371,14 +365,26 @@ while [ $ok -eq 0 ] ; do
                ALLOW_IP=$cc 
        fi 
        if [ "$ok" != "1" ] ; then 
+               echo "A Registration Timeout is the time it takes before Ping Timeouting"
+               echo "a client trying to connect to the server, which hasnt issued the initial"
+               echo "commands. It is recommended that you set this to 90, if you give no"
+               echo "value, the default will be used."
+               echo "Enter 'registration' timeout"
+              echo $n "[\033[1;32m90\033[0;37m] -> $c"
+               read cc
+               if [ ! "$cc" ] ; then
+                TIMEOUT = "90"
+               else
+                TIMEOUT = $cc
+               fi
                echo "Enter Password [If Applicable]" 
                echo $n "[] -> $c" 
                read cc 
                if [ ! "$cc" ] ; then
               default=1 
-                       echo "<connect allow=\"$ALLOW_IP\">" >> makeconf.temp 
+                       echo "<connect allow=\"$ALLOW_IP\" timeout=\"$TIMEOUT\">" >> makeconf.temp 
                else 
-                       echo "<connect allow=\"$ALLOW_IP\" password=\"$cc\">" >> makeconf.temp 
+                       echo "<connect allow=\"$ALLOW_IP\" password=\"$cc\" timeout=\"$TIMEOUT\>" >> makeconf.temp 
                fi 
        fi 
 done 
@@ -576,11 +582,10 @@ echo ""
 echo "The Following Modules are avaliable:"
 echo ""
 MODLINE=""
-for module in m_*.cpp ; do
-        mod=`perl -e '$a='$module';print substr($a,0,length($a)-3)'`
-        dmod=`perl -e '$a="'$mod.so'";while (length($a)<30) { $a = "$a ";}; print $a;'`
-        desc=`perl -e 'open (F, "<'$module'");local($/)=undef;$blah=<F>;$blah=~/\$ModDesc(.*)\*\//;print substr($1,13,length($1));close F;'`
-        echo -e "\033[1;32m$dmod\033[0;37m$desc"
+for module in src/modules/*.cpp ; do
+       desc=`grep '$ModDesc:' $module | sed 's/\/\* $ModDesc://' | sed 's/\*\///'`
+        mod=`echo $module | sed 's/.cpp/.so/' | sed 's/src\/modules\///'`
+       echo -e "\033[1;32m$mod\t\t\033[0;37m$desc"
 done
 echo ""
 
@@ -622,7 +627,7 @@ if [ $cc ] ; then
 fi
 
 echo ""
-echo "Debug [on / off] Switch on or off Extensive IRCd loggin to ircd.log"
+echo "Log level [debug, verbose, default, sparse, none]"
 echo -e $n "[\033[1;32m$OP_DEBUG\033[0;37m] -> $c"
 read cc
 if [ "$cc" ] ; then
@@ -650,12 +655,12 @@ echo "Enable Channel Founder? [Channel Mode +q] [yes/no]"
 echo -e $n "[\033[1;32m$OP_FOUND\033[0;37m] -> $c"
 read cc
 if [ "$cc" ] ; then
-        OP_DEBUG=$cc
+        OP_FOUND=$cc
 fi
 
 echo "#-#-#-#-#-#-#-#-#-#-#-#-#-  SERVER OPTIONS   -#-#-#-#-#-#-#-#-#-#-#-#-#" >> makeconf.temp
 echo "<options  prefixquit=\"$OP_PREFIX\"" >> makeconf.temp 
-echo "          debug=\"$OP_DEBUG\"" >> makeconf.temp
+echo "          loglevel=\"$OP_DEBUG\"" >> makeconf.temp
 echo "          allowhalfop=\"$OP_HALFY\"" >> makeconf.temp
 echo "          allowprotect=\"$OP_PROTE\"" >> makeconf.temp
 echo "          allowfounder=\"$OP_FOUND\">" >> makeconf.temp