Changed to work with new log-level

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@165 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 34316ab718fcd3efe997c0c639c6ed586e6525af..76f109d666061a860172ca76fb1ffe6eb98b2f31 100644 (file)
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -86,7 +86,7 @@
 #   need this ability should know the die and restart password.       #
 #                                                                     #
 #  Syntax is as follows:                                              #
-#       <power diepass="die password" restartpass="restart password"
+#       <power diepass="die password" restartpass="restart password"  #
 #       pause="secs before dying">                                   #
 #                                                                     #
 
@@ -177,7 +177,31 @@
         type="NetAdmin">
 
 
-#-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION   -#-#-#-#-#-#-#-#-#-
+#-#-#-#-#-#-#-#-#-#-#-  SERVER LINK CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+#                                                                     #
+# Defines which servers can link to this one, and which servers this  #
+# server may create outbound links to.                                #
+#                                                                     #
+# name      - The name is the canocial name of the server, it does    #
+#             not have to resolve - but it is expected to be sent in  #
+#             the remote servers connection info.                     #
+# ipaddr    - Valid ip address for remote server.                     #
+# port      - Valid listening UDP port for remote server.             #
+# sendpass  - Password to send to create an outbound connection to    #
+#             this server.                                            #
+# recvpass  - Password to receive to accept an inbound connection     #
+#             from this server.                                       #
+#                                                                     #
+
+<server name="hub.penguin.org"
+       ipaddr="12.34.56.78"
+       port="7000"
+       sendpass="outgoing!password"
+       recvpass="incoming!password">
+
+
+
+#-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
 #                                                                    #
 #   These options let you define the path to your motd and rules      #
 #   files.                                                           #

diff --git a/makeconf b/makeconf
index 22cba966824f0b103a7b1209f5f0815e77a00c1d..7250a3c985735d9319baa25bb128ef26b98ff1ab 100755 (executable)
--- a/makeconf
+++ b/makeconf
@@ -44,7 +44,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"
@@ -622,7 +622,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