Author: ZenShadow <grep@doyle.net>

[ircu2.10.12-pk.git] / config / config-sh.in

diff --git a/config/config-sh.in b/config/config-sh.in
index 52d40bdd0022986f71283bec35fa416f8dbfd72c..f2bc5e9a9d953435069066b9bf418b39f8d04c6b 100644 (file)
--- a/config/config-sh.in
+++ b/config/config-sh.in
@@ -171,12 +171,13 @@ endmenu
 
 mainmenu_option next_comment
 comment 'General defines'
-  bool 'Change root ('/') after start of daemon' CHROOTDIR
-  bool 'Do you want the daemon set its own uid/gid' CONFIG_SETUGID
+  bool 'Do you want the daemon set its own uid/gid (say yes for chroot!)' CONFIG_SETUGID
   if [ "$CONFIG_SETUGID" = "y" ]; then
     int '   UID of irc daemon' IRC_UID
     int '   GID of irc daemon' IRC_GID
+    bool '   Change root ('/') after start of daemon' CHROOTDIR
   else
+    define_bool CHROOTDIR n
     define_int IRC_UID $IRC_UID
     define_int IRC_GID $IRC_GID
     bool 'Allow to specify configuration file on command line' CMDLINE_CONFIG
@@ -197,7 +198,11 @@ mainmenu_option next_comment
 comment 'Paths and files'
   eval DPATH_DEFAULT="${prefix}/lib/ircd"
   string 'Directory where all ircd stuff resides' DPATH $DPATH_DEFAULT
-  define_string SPATH "$BINDIR/$SYMLINK"
+  if [ "$CHROOTDIR" = "y" ] ; then
+    define_string SPATH "/$SYMLINK"
+  else
+    define_string SPATH "$BINDIR/$SYMLINK"
+  fi
   echo "The following filenames are either full paths or files within DPATH"
   string 'Server configuration file' CPATH 'ircd.conf'
   string 'Server MOTD file' MPATH 'ircd.motd'
@@ -241,11 +246,11 @@ comment 'Bad Channel G-Lines allow operators to add channel masks to a list whic
     fi
   bool 'Do you want to log connecting users to a separate file' CONFIG_LOG_USERS
     if [ "$CONFIG_LOG_USERS" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' FNAME_USERLOG $DPATH/users
+      string '   Give the path and(or) filename of this log file' FNAME_USERLOG users.log
     fi
   bool 'Do you want to log Opers to a separate file' CONFIG_LOG_OPERS
     if [ "$CONFIG_LOG_OPERS" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' FNAME_OPERLOG $DPATH/opers
+      string '   Give the path and(or) filename of this log file' FNAME_OPERLOG opers.log
     fi
   if [ "$ac_cv_header_syslog_h" = "yes" ]; then
     bool 'Do you want to use syslog' USE_SYSLOG
@@ -374,7 +379,7 @@ comment 'Mandatory defines (you should leave these untouched)'
     define_bool LOCAL_KILL_ONLY $LOCAL_KILL_ONLY
   fi
   int 'KILL nick chase time limit (30)' KILLCHASETIMELIMIT 30
-  int 'Max number of channels per user (recommended: 5)' MAXCHANNELSPERUSER 10
+  int 'Max number of channels per user (recommended: 10)' MAXCHANNELSPERUSER 10
   int 'Max number of silence masks (15!)' MAXSILES 15
   int 'Expected average banmask length (40!)' AVBANLEN 40
   eval define_macro MAXSILELENGTH \'\($AVBANLEN * MAXSILES\)\'
@@ -390,5 +395,6 @@ endmenu
 
 mainmenu_option next_comment
 comment 'Experimental options (Do you know what you'\''re doing?)'
-  bool 'Use new MODE implementation' CONFIG_NEW_MODE
+  bool 'Use new MODE implementation' CONFIG_NEW_MODE y
+  bool 'Use new oper commands (JUPE, CLEARMODE, OPMODE, GLINE)' CONFIG_OPERCMDS y
 endmenu