From e94171cc94f7a6c702923cb2f004c0958b77f3c8 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sun, 4 Aug 2002 11:41:39 +0000 Subject: [PATCH] Added setup for outbound queue --- ChangeLog | 9 +++++++++ Makefile | 1 + html/setup/global.html | 3 ++- lib/structs.h | 1 + mbsetup/m_global.c | 33 +++++++++++++++++++++------------ mbtask/mbtask.c | 1 + 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bdf045a..3bf3ff20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ $Id$ +WARNING, OUTBOUND QUEUE MAY NOT WORK WITH THIS VERSION, DO NOT USE !!!!!!!! MBSEBBS History. v0.35.03 06-Jul-2002 + upgrade: + After installation restart mbtask. + Start mbsetup, enter global configuration and exit and save. + This will setup the new outbound queue path, default is + /opt/mbse/var/queue. + common.a: Added nodelist override to the nodelist lookup function. Added protection against emty rfc headers with only a space. @@ -55,6 +62,7 @@ v0.35.03 06-Jul-2002 The test to add a node to the calllist now also checks the internal call flag. Makes use of the node nodelist override settings. + Added default setting for outbound queue. mbsetup: Enabled setting of nodelist override settings in menu 7.x.3 @@ -66,6 +74,7 @@ v0.35.03 06-Jul-2002 Corrected several page layouts for printing on A4 paper. Added setup for nodes connected via directories (we are the FTP server side). + Added setup setting for outbound queue in global setup. script: The bbsdoor.sh and rundoor.sh scripts are now only installed diff --git a/Makefile b/Makefile index 987ac7a3..e7379d26 100644 --- a/Makefile +++ b/Makefile @@ -137,6 +137,7 @@ install: mkdir ${PREFIX}/var/nodelist ; \ mkdir ${PREFIX}/var/bso ; \ mkdir ${PREFIX}/var/bso/outbound ; \ + mkdir ${PREFIX}/var/queue ; \ mkdir ${PREFIX}/var/msgs; \ mkdir ${PREFIX}/var/badtic ; \ mkdir ${PREFIX}/var/ticqueue ; \ diff --git a/html/setup/global.html b/html/setup/global.html index eb64f8c2..1838af02 100644 --- a/html/setup/global.html +++ b/html/setup/global.html @@ -12,7 +12,7 @@
-
Last update 17-Jun-2002
+
Last update 04-Aug-2002

 

MBSE BBS Setup - Global Setup

@@ -68,6 +68,7 @@ group them. Inbound The unprotected fidonet inbound Prot inb. The (password) protected fidonet inbound Outbound The outbound for the main aka +Out queue The outbound queue for temporary files *.msgs A netmail directory from where *.msg mails are tossed These are *.msg files can be created by several doors. (Not in use yet) Bad TIC's Where bad TIC files are saved diff --git a/lib/structs.h b/lib/structs.h index 110a8589..63d1b772 100644 --- a/lib/structs.h +++ b/lib/structs.h @@ -795,6 +795,7 @@ struct sysconfig { int newsfeed; /* Newsfeed mode */ int maxarticles; /* Default max articles */ char bbs_macros[65]; /* Default macros path */ + char out_queue[65]; /* Outbound queue path */ }; diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index 2431c3e4..ef856443 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -270,10 +270,11 @@ void s_global(void) mvprintw(11, 2, "6. Inbound"); mvprintw(12, 2, "7. Prot inb."); mvprintw(13, 2, "8. Outbound"); - mvprintw(14, 2, "9. *.msgs"); - mvprintw(15, 2, "10. Bad TIC's"); - mvprintw(16, 2, "11. TIC queue"); - mvprintw(17, 2, "12. Next Screen"); + mvprintw(14, 2, "9. Out queue"); + mvprintw(15, 2, "10. *.msgs"); + mvprintw(16, 2, "11. Bad TIC's"); + mvprintw(17, 2, "12. TIC queue"); + mvprintw(18, 2, "13. Next Screen"); } @@ -292,11 +293,12 @@ void e_global(void) show_str(11,16,64, CFG.inbound); show_str(12,16,64, CFG.pinbound); show_str(13,16,64, CFG.outbound); - show_str(14,16,64, CFG.msgs_path); - show_str(15,16,64, CFG.badtic); - show_str(16,16,64, CFG.ticout); + show_str(14,16,64, CFG.out_queue); + show_str(15,16,64, CFG.msgs_path); + show_str(16,16,64, CFG.badtic); + show_str(17,16,64, CFG.ticout); - switch(select_menu(12)) { + switch(select_menu(13)) { case 0: return; case 1: E_PTH( 6,16,64, CFG.bbs_menus, "The path to the ^default menus^.", 0750) case 2: E_PTH( 7,16,64, CFG.bbs_txtfiles, "The path to the ^default textfiles^.", 0750) @@ -306,10 +308,11 @@ void e_global(void) case 6: E_PTH(11,16,64, CFG.inbound, "The path to the ^inbound^ for unknown systems.", 0750) case 7: E_PTH(12,16,64, CFG.pinbound, "The path to the ^nodelists^ for protected systems.", 0750) case 8: E_PTH(13,16,64, CFG.outbound, "The path to the base ^outbound^ directory.", 0750) - case 9: E_PTH(14,16,64, CFG.msgs_path, "The path to the ^*.msgs^ directory.", 0750) - case 10:E_PTH(15,16,64, CFG.badtic, "The path to the ^bad tic files^.", 0750) - case 11:E_PTH(16,16,64, CFG.ticout, "The path to the ^outgoing TIC^ files.", 0750) - case 12:e_global2(); + case 9: E_PTH(14,16,64, CFG.out_queue, "The path to the ^temp outbound queue^ directory.", 0750) + case 10:E_PTH(15,16,64, CFG.msgs_path, "The path to the ^*.msgs^ directory.", 0750) + case 12:E_PTH(16,16,64, CFG.badtic, "The path to the ^bad tic files^.", 0750) + case 13:E_PTH(17,16,64, CFG.ticout, "The path to the ^outgoing TIC^ files.", 0750) + case 14:e_global2(); s_global(); break; } @@ -1577,6 +1580,10 @@ void global_menu(void) sprintf(CFG.bbs_macros, "%s/english/macro", getenv("MBSE_ROOT")); } + if (strlen(CFG.out_queue) == 0) { + sprintf(CFG.out_queue, "%s/var/queue", getenv("MBSE_ROOT")); + } + for (;;) { clr_index(); @@ -1804,6 +1811,8 @@ int global_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Nodelists %s\n", CFG.nodelists); fprintf(fp, " Unsafe inbound %s\n", CFG.inbound); fprintf(fp, " Known inbound %s\n", CFG.pinbound); + fprintf(fp, " Outbound %s\n", CFG.outbound); + fprintf(fp, " Out queue %s\n", CFG.out_queue); fprintf(fp, " *.msgs path %s\n", CFG.msgs_path); fprintf(fp, " Bad TIC's %s\n", CFG.badtic); fprintf(fp, " TIC queue %s\n", CFG.ticout); diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c index 9080f553..b84274d4 100644 --- a/mbtask/mbtask.c +++ b/mbtask/mbtask.c @@ -163,6 +163,7 @@ void load_maincfg(void) sprintf(CFG.ticout, "%s/var/ticqueue", getenv("MBSE_ROOT")); sprintf(CFG.req_magic, "%s/magic", getenv("MBSE_ROOT")); sprintf(CFG.alists_path, "%s/var/arealists", getenv("MBSE_ROOT")); + sprintf(CFG.out_queue, "%s/var/queue", getenv("MBSE_ROOT")); CFG.leavecase = TRUE; /*