diff --git a/ChangeLog b/ChangeLog index ec9e3294..e92e7af7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,20 @@ v0.39.7 14-Jan-2004 mbtask: Will call points if a call method is available. + script: + New scripts are installed with an extension of .new, you need + to check yourself if you can use them to replace your own + possible modified scripts. + Updated the hatch script to abort if it's not configured. + If the user skips to hatch a file, the questions for the magic + and replace command are not shown anymore. + + examples: + Changed Dutch newfiles template file. + + html: + Added upgrade procedure. + v0.39.6 11-Jan-2004 - 14-Jan-2004 diff --git a/configure b/configure index 22089cb0..524ec049 100755 --- a/configure +++ b/configure @@ -8248,7 +8248,7 @@ echo "${ECHO_T}$vpop" >&6 done - ac_config_files="$ac_config_files Makefile.global paths.h unix/login.defs INSTALL FILE_ID.DIZ script/editor html/index.htm html/basic.html" + ac_config_files="$ac_config_files Makefile.global paths.h unix/login.defs INSTALL FILE_ID.DIZ script/editor html/index.htm html/basic.html html/upgrade.html" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -8790,6 +8790,7 @@ do "script/editor" ) CONFIG_FILES="$CONFIG_FILES script/editor" ;; "html/index.htm" ) CONFIG_FILES="$CONFIG_FILES html/index.htm" ;; "html/basic.html" ) CONFIG_FILES="$CONFIG_FILES html/basic.html" ;; + "html/upgrade.html" ) CONFIG_FILES="$CONFIG_FILES html/upgrade.html" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff --git a/configure.in b/configure.in index 3dbf2877..a36b74da 100644 --- a/configure.in +++ b/configure.in @@ -345,6 +345,7 @@ AC_OUTPUT( script/editor html/index.htm html/basic.html + html/upgrade.html ) #================================================================================= diff --git a/html/.cvsignore b/html/.cvsignore index 68c7ac2e..27ee8d66 100644 --- a/html/.cvsignore +++ b/html/.cvsignore @@ -1 +1 @@ -filelist index.htm basic.html +filelist index.htm basic.html upgrade.html diff --git a/html/Makefile b/html/Makefile index 36f292be..7af45e50 100644 --- a/html/Makefile +++ b/html/Makefile @@ -73,9 +73,9 @@ H_SETUP = setup/archiver.html setup/index.htm setup/bbs.html \ setup/hatch.html setup/virscan.html setup/services.html \ setup/domains.html setup/taskmgr.html setup/route.html -H_OTHER = index.htm basic.html +H_OTHER = index.htm basic.html upgrade.html -H_IN = index.htm.in basic.html.in +H_IN = index.htm.in basic.html.in upgrade.html.in FILES = $(H_IN) $(H_BASE) $(H_FTSC) $(H_IMAGES) $(H_LICENSE) $(H_MENUS) $(H_MISC) $(H_PROGS) $(H_SETUP) Makefile diff --git a/html/basic.html.in b/html/basic.html.in index 8e034fc5..3c625a60 100644 --- a/html/basic.html.in +++ b/html/basic.html.in @@ -14,7 +14,7 @@
-
Last update 09-Nov-2003
+
Last update 21-Jan-2004

MBSE BBS Basic Installation

Introduction.

@@ -166,7 +166,7 @@ rm -Rf mbsebbs-@VERSION@ Login as user mbse. Yes, very important, login as user mbse. While in mbse's home directory (/opt/mbse) unpack the distribution archives: 
-tar xfvz /path/to/mbsebbs-@VERSION@.tar.bz2
+tar xfvj /path/to/mbsebbs-@VERSION@.tar.bz2
You now have the subdirectory with sources in the right place. Next build the binaries and install them using the following commands: diff --git a/html/index.htm.in b/html/index.htm.in index 1fb84dff..6a5c7d7f 100644 --- a/html/index.htm.in +++ b/html/index.htm.in @@ -16,7 +16,7 @@
MBSE

MBSE BBS System Guide @VERSION@

-
Last update 26-Nov-2003
+
Last update 21-Jan-2004

Introduction

@@ -42,6 +42,7 @@
  • Running a BBS under Linux
  • Which distribution to use
  • Basic installation MBSE BBS
    • +
  • Upgrade MBSE BBS
  • Configuring the bbs with mbsetup
    1. Edit Global configuration diff --git a/html/upgrade.html.in b/html/upgrade.html.in new file mode 100644 index 00000000..39c40346 --- /dev/null +++ b/html/upgrade.html.in @@ -0,0 +1,84 @@ + + + + + + + + + + + +Upgrade MBSE BBS. + + + +
      +
      Last update 21-Jan-2004
      +

      Upgrade MBSE BBS

      + +

      Introduction.

      +

      +First of all, if you upgrade from a previous version of MBSE BBS, +read all the ChangeLog entries from the version you are currently +running upto the new @VERSION@ version you are installing. +Then make a backup of at least all files in /opt/mbse/bin and /opt/mbse/etc. +

       

      + + +

      Install the source.

      +

      +Login as user mbse. Yes, very important, login as user mbse. +While in mbse's home directory (/opt/mbse) unpack the distribution archives: +

      +tar xfvj /path/to/mbsebbs-@VERSION@.tar.bz2
+
      +You now have the subdirectory with sources in the right place. +Next build the binaries and install them using the following commands: +
      +cd ~/mbsebbs-@VERSION@
+make clean
+./configure
+make
+su        important, do not use "su -"
+password: enter root password here
+make install
+
      +The last part of the installation procedure shows you the location of the bbs +startup script that is added to your system. Remember this one for a moment. +

      +Now restart the bbs (still as root) by executing the startup +script you just saw on the screen followed by a space and the word reload or restart, +this depends on the distribution you use. There are also distributions that must use the startup +script twice, once with stop and then start as parameter. +For example: +

      +/etc/rc.d/init.d/mbsed reload
+exit
+
      +This will close the bbs, kill mbtask, start the new mbtask and open +the bbs again for use. At this point you may need to update some configuration settings +with mbsetup. Read the ChangeLog for the details. The ChangeLog may also describe a +different restart procedure if this is needed. +

       

      + +

      Other updates

      +

      +Not everything is updated during the upgrade, only the binaries. Normally this is enough. +However it may be that the example menus, macro templates are updated in the distribution. +Because these files may have some very personal changes, these files are not overwritten. +You can force that, in the subdirectory ~/mbsebbs-@VERSION@/examples type +

      +make help
+
      +to see what you can force to update. But carefully taking over the changes may be better. +
      +In the directory /opt/mbse/bin and /opt/mbse/etc are new scripts installed. They have the +extension .new and you need to examine these to see if you can simply copy these over +your current ones. +

      +Back to IndexBack to Index + +

      + + diff --git a/script/Makefile b/script/Makefile index 4739e74f..3264f950 100644 --- a/script/Makefile +++ b/script/Makefile @@ -19,24 +19,39 @@ install: echo; echo " Must be root to install!"; echo; exit 3; \ fi @if [ ! -x ${ETCDIR}/maint ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 maint ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 maint ${ETCDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 maint ${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 maint ${ETCDIR}" ; \ + else \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 maint ${ETCDIR}/maint.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 maint ${ETCDIR}/maint.new" ; \ fi @if [ ! -x ${ETCDIR}/midnight ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 midnight ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 midnight ${ETCDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 midnight ${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 midnight ${ETCDIR}" ; \ + else \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 midnight ${ETCDIR}/midnight.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 midnight ${ETCDIR}/midnight.new" ; \ fi @if [ ! -x ${ETCDIR}/weekly ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 weekly ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 weekly ${ETCDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 weekly ${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 weekly ${ETCDIR}" ; \ + else \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 weekly ${ETCDIR}/weekly.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 weekly ${ETCDIR}/weekly.new" ; \ fi @if [ ! -x ${ETCDIR}/monthly ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 monthly ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 monthly ${ETCDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 monthly ${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 monthly ${ETCDIR}" ; \ + else \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 monthly ${ETCDIR}/monthly.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 monthly ${ETCDIR}/monthly.new" ; \ fi @if [ ! -x ${BINDIR}/hatch ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 hatch ${BINDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0744 hatch ${BINDIR}" ; \ + else \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 hatch ${BINDIR}/hatch.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 hatch ${BINDIR}/hatch/new" ; \ fi @if [ -x ${JOEBIN}/joe ]; then \ echo "Installing support for joe editor" ; \ @@ -60,6 +75,11 @@ install: echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR}" ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR} ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR}" ; \ + else \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 bbsdoor.sh ${BINDIR}/bbsdoor.sh.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 bbsdoor.sh ${BINDIR}/bbsdoor.sh.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 rundoor.sh ${BINDIR}/rundoor.sh.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 rundoor.sh ${BINDIR}/rundoor.sh.new" ; \ fi @bash ./installinit.sh diff --git a/script/hatch b/script/hatch index c2811a8b..af2be7c4 100644 --- a/script/hatch +++ b/script/hatch @@ -5,7 +5,7 @@ # Hatch script for MBSE BBS. # #============================================================================ -# Copyright (C) 1997-2002 +# Copyright (C) 1997-2004 # # Michiel Broek FIDO: 2:280/2802 # Beekmansbos 10 @@ -31,11 +31,11 @@ # # Global settings, change as needed: # -# Password, see menu 1.13.2 +# Password, see menu 1.10.2 # HATCHPWD="DizIzMyBIGseeKret" INBOUND=$MBSE_ROOT/var/inbound -HVERSION="1.0.1" +HVERSION="1.0.2" if [ "`id -un`" != "mbse" ]; then @@ -43,6 +43,11 @@ if [ "`id -un`" != "mbse" ]; then exit 1 fi +if [ "DizIzMyBIGseeKret" == "${HATCHPWD}" ]; then + echo "This script is not yet configured, first edit this script before use!" + exit 1 +fi + cat < $FILE