diff options
-rw-r--r-- | NEWS | 15 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/wydawca.texi | 116 | ||||
-rw-r--r-- | modules/logstat/mod_logstat.c | 5 | ||||
-rw-r--r-- | src/module.c | 10 |
5 files changed, 107 insertions, 41 deletions
@@ -1,15 +1,22 @@ | |||
1 | Wydawca NEWS -- history of user-visible changes. 2019-07-15 | 1 | Wydawca NEWS -- history of user-visible changes. 2019-07-22 |
2 | See the end of file for copying conditions. | 2 | See the end of file for copying conditions. |
3 | 3 | ||
4 | Please send Wydawca bug reports to <bug-wydawca@gnu.org.ua>. | 4 | Please send Wydawca bug reports to <bug-wydawca@gnu.org.ua>. |
5 | 5 | ||
6 | 6 | ||
7 | Version 2.99.92 (git) | 7 | Version 3.0, 2019-07-22 |
8 | 8 | ||
9 | * Introduce loadable modules. | 9 | * Introduce loadable modules. |
10 | 10 | ||
11 | Two modules are provided: mailutils, for using GNU mailutils, and | 11 | Two modules are provided: mailutils, for mail notification using GNU |
12 | logstat, for logging statistics. | 12 | mailutils, and logstat, for logging statistics. |
13 | |||
14 | * Directory setup | ||
15 | |||
16 | The new statement "create-directories" instructs wydawca to create | ||
17 | missing source, destination and archive directories. Additional | ||
18 | configuration statements are provided to configure ownership and modes | ||
19 | of the created directories. | ||
13 | 20 | ||
14 | * Bugfixes | 21 | * Bugfixes |
15 | ** Avoid processing same triplet twice. | 22 | ** Avoid processing same triplet twice. |
diff --git a/configure.ac b/configure.ac index b070a4c..2eb680f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -15,7 +15,7 @@ | |||
15 | # along with wydawca. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with wydawca. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | AC_PREREQ(2.63) | 17 | AC_PREREQ(2.63) |
18 | AC_INIT([wydawca], 2.99.92, [bug-wydawca@gnu.org.ua], [wydawca], | 18 | AC_INIT([wydawca], 3.0, [bug-wydawca@gnu.org.ua], [wydawca], |
19 | [http://www.gnu.org.ua/software/wydawca]) | 19 | [http://www.gnu.org.ua/software/wydawca]) |
20 | AC_CONFIG_SRCDIR([src/wydawca.c]) | 20 | AC_CONFIG_SRCDIR([src/wydawca.c]) |
21 | AC_CONFIG_AUX_DIR([build-aux]) | 21 | AC_CONFIG_AUX_DIR([build-aux]) |
diff --git a/doc/wydawca.texi b/doc/wydawca.texi index 6f769d1..2763b6d 100644 --- a/doc/wydawca.texi +++ b/doc/wydawca.texi | |||
@@ -930,6 +930,11 @@ is similar to GNU m4 @option{--prefix-builtin} options, but has an | |||
930 | advantage that it works with non-GNU @command{m4} implementations as | 930 | advantage that it works with non-GNU @command{m4} implementations as |
931 | well. | 931 | well. |
932 | 932 | ||
933 | @sopindex{E, described} | ||
934 | To examine the preprocessed configuration, use the @option{-E} | ||
935 | option. The output from @command{m4} will be printed on the standard | ||
936 | output and the program will terminate. | ||
937 | |||
933 | Additional control over the preprocessor is provided via the | 938 | Additional control over the preprocessor is provided via the |
934 | following command line options: | 939 | following command line options: |
935 | 940 | ||
@@ -1774,6 +1779,11 @@ This statement is overridden by per-directory statements: | |||
1774 | in @code{archive} block (@pxref{archivation}). | 1779 | in @code{archive} block (@pxref{archivation}). |
1775 | @end deffn | 1780 | @end deffn |
1776 | 1781 | ||
1782 | Notice, that both @code{directory-mode} and @code{directory-owner} | ||
1783 | apply only to the last component of the created directory | ||
1784 | (@samp{basename}). Any intermediate directories are created with | ||
1785 | default mode and ownership. | ||
1786 | |||
1777 | @node archivation | 1787 | @node archivation |
1778 | @section Archivation | 1788 | @section Archivation |
1779 | @cindex archivation, defined | 1789 | @cindex archivation, defined |
@@ -2437,6 +2447,7 @@ Unless @var{file} in the @samp{module} statement it is an absolute | |||
2437 | file name, it will be searched in the library load path, which is | 2447 | file name, it will be searched in the library load path, which is |
2438 | defined as: | 2448 | defined as: |
2439 | 2449 | ||
2450 | @anchor{library search path} | ||
2440 | @enumerate 1 | 2451 | @enumerate 1 |
2441 | @item | 2452 | @item |
2442 | Optional @dfn{prefix} search directories specified by the | 2453 | Optional @dfn{prefix} search directories specified by the |
@@ -2501,6 +2512,21 @@ configuration statements. See the module descriptions below for a | |||
2501 | detailed discussion of these. | 2512 | detailed discussion of these. |
2502 | @end deffn | 2513 | @end deffn |
2503 | 2514 | ||
2515 | @xopindex{module-help, introduced} | ||
2516 | To list module-specific configuration directives with a short usage | ||
2517 | instructions, use the @option{--module-help} statement: | ||
2518 | |||
2519 | @smallexample | ||
2520 | wydawca --module-help=@var{file} | ||
2521 | @end smallexample | ||
2522 | |||
2523 | @noindent | ||
2524 | If the @var{file} argument is the base module name | ||
2525 | (e.g. @samp{mod_mailutils}), it will be looked in the default | ||
2526 | library load path (@pxref{library search path}). If it contains | ||
2527 | directory components, the @var{file} will be loaded from the specified | ||
2528 | directory. | ||
2529 | |||
2504 | @node event notification | 2530 | @node event notification |
2505 | @subsection Event Notification | 2531 | @subsection Event Notification |
2506 | 2532 | ||
@@ -3625,25 +3651,34 @@ spool @var{tag:@i{string}} @{ | |||
3625 | @cindex invocation | 3651 | @cindex invocation |
3626 | @cindex command line options | 3652 | @cindex command line options |
3627 | This chapter presents a short reference of all @command{wydawca} | 3653 | This chapter presents a short reference of all @command{wydawca} |
3628 | command line options, in alphabetical order. | 3654 | command line options. The entries are sorted alphabetically by their |
3655 | long option name. Where no long option exists, short option | ||
3656 | is used instead. | ||
3629 | 3657 | ||
3630 | @table @option | 3658 | @table @option |
3631 | @opsummary{config-file} | 3659 | @opsummary{config-file} |
3660 | @sopindex{c, summary} | ||
3632 | @item --config-file=@var{file} | 3661 | @item --config-file=@var{file} |
3633 | @itemx -c @var{file} | 3662 | @itemx -c @var{file} |
3634 | Use @var{file} instead of the default configuration | 3663 | Use @var{file} instead of the default configuration file. |
3635 | file. | ||
3636 | 3664 | ||
3637 | @xref{config-file, The @option{--config-file} option}. | 3665 | @xref{config-file, The @option{--config-file} option}. |
3638 | 3666 | ||
3667 | @opsummary{config-help} | ||
3668 | @item --config-help | ||
3669 | Display a concise summary of the available configuration directives. | ||
3670 | This does not include statements specific for particular loadable | ||
3671 | modules. To display these, use the @option{--module-help} option | ||
3672 | (@pxref{modules, --module-help}). | ||
3673 | |||
3639 | @opsummary{cron} | 3674 | @opsummary{cron} |
3640 | @opsummary{syslog} | ||
3641 | @item --cron | 3675 | @item --cron |
3642 | Run in cron mode. @xref{starting,, cron}. | 3676 | Run in cron mode. @xref{starting,, cron}. |
3643 | 3677 | ||
3644 | @xref{stderr, The @option{--syslog} option}. | 3678 | @xref{stderr, The @option{--syslog} option}. |
3645 | 3679 | ||
3646 | @opsummary{debug} | 3680 | @opsummary{debug} |
3681 | @sopindex{d, summary} | ||
3647 | @item --debug | 3682 | @item --debug |
3648 | @itemx -d | 3683 | @itemx -d |
3649 | Increase debugging level by 1. | 3684 | Increase debugging level by 1. |
@@ -3651,8 +3686,9 @@ Increase debugging level by 1. | |||
3651 | @xref{debug, The @option{--debug} option}. | 3686 | @xref{debug, The @option{--debug} option}. |
3652 | 3687 | ||
3653 | @opsummary{define} | 3688 | @opsummary{define} |
3689 | @sopindex{D, summary} | ||
3654 | @item --define=@var{name}[=@var{value}] | 3690 | @item --define=@var{name}[=@var{value}] |
3655 | @itemx -D@var{name}[=@var{value}] | 3691 | @itemx -D @var{name}[=@var{value}] |
3656 | Define the preprocessor symbol @var{name} as having @var{value}, or | 3692 | Define the preprocessor symbol @var{name} as having @var{value}, or |
3657 | empty. @xref{Preprocessor}. | 3693 | empty. @xref{Preprocessor}. |
3658 | 3694 | ||
@@ -3667,6 +3703,7 @@ Dump lexical analyzer traces. This is useful for debugging | |||
3667 | @command{wydawca} configuration file parser. | 3703 | @command{wydawca} configuration file parser. |
3668 | 3704 | ||
3669 | @opsummary{dry-run} | 3705 | @opsummary{dry-run} |
3706 | @sopindex{n, summary} | ||
3670 | @item --dry-run | 3707 | @item --dry-run |
3671 | @itemx -n | 3708 | @itemx -n |
3672 | @dfn{Dry-run mode}: do nothing, print almost everything. This option | 3709 | @dfn{Dry-run mode}: do nothing, print almost everything. This option |
@@ -3674,28 +3711,11 @@ implies @option{--debug --stderr}. | |||
3674 | 3711 | ||
3675 | @xref{dry-run, The dry-run mode}. | 3712 | @xref{dry-run, The dry-run mode}. |
3676 | 3713 | ||
3677 | @opsummary{stderr} | 3714 | @anchor{-E} |
3678 | @item --stderr | 3715 | @sopindex{E, summary} |
3679 | @itemx -e | 3716 | @item -E |
3680 | Log to the standard error. | 3717 | Dump the preprocessed configuration to stdout and exit. |
3681 | 3718 | @pxref{Preprocessor}. | |
3682 | @xref{stderr, The @option{--stderr} option}. | ||
3683 | |||
3684 | @opsummary{spool} | ||
3685 | @item --spool=@var{tag} | ||
3686 | @itemx -S @var{tag} | ||
3687 | Process only spool with the given tag. @xref{spool selection}. | ||
3688 | |||
3689 | @item --source=@var{dir} | ||
3690 | @itemx -s @var{dir} | ||
3691 | Process only spool with @var{dir} as the source directory. | ||
3692 | @xref{spool selection}. | ||
3693 | |||
3694 | @opsummary{syslog} | ||
3695 | @item --syslog | ||
3696 | Log all diagnostics to syslog. | ||
3697 | |||
3698 | @xref{stderr, The @option{--syslog} option}. | ||
3699 | 3719 | ||
3700 | @opsummary{force} | 3720 | @opsummary{force} |
3701 | @item --force | 3721 | @item --force |
@@ -3706,7 +3726,14 @@ Force start-up, even if if the PID file already exists. | |||
3706 | Remain in the foreground. This is mostly for debugging | 3726 | Remain in the foreground. This is mostly for debugging |
3707 | @command{wydawca}. | 3727 | @command{wydawca}. |
3708 | 3728 | ||
3729 | @opsummary{help} | ||
3730 | @sopindex{h, summary} | ||
3731 | @item --help | ||
3732 | @itemx -h | ||
3733 | Print a concise usage summary and exit. | ||
3734 | |||
3709 | @opsummary{include-directory} | 3735 | @opsummary{include-directory} |
3736 | @sopindex{I, summary} | ||
3710 | @item --include-directory=@var{dir} | 3737 | @item --include-directory=@var{dir} |
3711 | @itemx -I @var{dir} | 3738 | @itemx -I @var{dir} |
3712 | Add @var{dir} to include search path. | 3739 | Add @var{dir} to include search path. |
@@ -3714,6 +3741,7 @@ Add @var{dir} to include search path. | |||
3714 | @xref{Pragmatic Comments, #include}. @xref{Preprocessor}. | 3741 | @xref{Pragmatic Comments, #include}. @xref{Preprocessor}. |
3715 | 3742 | ||
3716 | @opsummary{lint} | 3743 | @opsummary{lint} |
3744 | @sopindex{t, summary} | ||