X-Git-Url: https://code.th-h.de/?p=usenet%2Fyapfaq.git;a=blobdiff_plain;f=yapfaq.pl;h=0e141e52bcd81ceb3d60f633124454b65cb8cb4d;hp=0d331b04b6a6ba2fcc388575b3b2b45d4235408c;hb=5a6670c7ff54e30051018ff1e333e314ffa0d2dc;hpb=2507947f17862c5463b0def8ce942e6d5b62631c;ds=sidebyside diff --git a/yapfaq.pl b/yapfaq.pl index 0d331b0..0e141e5 100644 --- a/yapfaq.pl +++ b/yapfaq.pl @@ -14,6 +14,12 @@ my $Version = "0.6.2"; +my $RCFile = '.yapfaqrc'; +my @ValidConfVars = ('NNTPServer','NNTPUser','NNTPPass','Sender','ConfigFile', + 'UsePGP','pgp','PGPVersion','PGPSigner','PGPPass', + 'PathtoPGPPass','pgpbegin','pgpend','pgptmpf','pgpheader'); + +################################### Defaults ################################## my %Config = (NNTPServer => "localhost", NNTPUser => "", NNTPPass => "", @@ -56,7 +62,7 @@ my ($TDY, $TDM, $TDD) = Today(); #TD: Today's date # read commandline options my %Options; -getopts('Vhvpdt:f:s:', \%Options); +getopts('Vhvpdt:f:c:s:', \%Options); # -V: print version / copyright information if ($Options{'V'}) { print "$0 v $Version\nCopyright (c) 2003 Marc Brockschmidt \nCopyright (c) 2010 Thomas Hochstein \n"; @@ -71,6 +77,14 @@ if ($Options{'h'}) { # -f: set $Faq my ($Faq) = $Options{'f'} if ($Options{'f'}); +# read runtime configuration (configuration variables) +$RCFile = $Options{'c'} if ($Options{'c'}); +if (-f $RCFile) { + readrc (\$RCFile,\%Config); +} else { + warn "$0: W: .rc file $RCFile does not exist!\n"; +} + # read configuration (configured FAQs) my @Config; readconfig (\$Config{'ConfigFile'}, \@Config, \$Faq); @@ -124,6 +138,26 @@ foreach (@Config) { exit; +#################################### readrc #################################### +# Takes a filename and the reference to an array which contains the valid options + +sub readrc{ + my ($File, $Config) = @_; + + print "Reading $$File.\n" if($Options{'v'}); + + open FH, "<$$File" or die "$0: Can't open $$File: $!"; + while () { + if (/^\s*(\S+)\s*=\s*'?(.*?)'?\s*(#.*$|$)/) { + if (grep(/$1/,@ValidConfVars)) { + $$Config{$1} = $2 if $2 ne ''; + } else { + warn "$0: W: $1 is not a valid configuration variable (reading from $$File)\n"; + } + } + } +} + ################################## readconfig ################################## # Takes a filename, a reference to an array, which will hold hashes with # the data from $File, and - optionally - the name of the (single) FAQ to post @@ -198,6 +232,21 @@ sub calcdelta { } return ($NYear, $NMonth, $NDay); } + +################################ updatestatus ############################### +# Takes a MID and a status file name +# and writes status information to disk + +sub updatestatus { + my ($ActName, $File, $date, $MID) = @_; + + print "$$ActName: Save status information.\n" if($Options{'v'}); + + open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!"; + print FH "##;; Lastpost: $date\n"; + print FH "##;; LastMID: $MID\n"; + close FH; +} ################################## postfaq ################################## # Takes a filename and many other vars. @@ -287,18 +336,13 @@ sub postfaq { # post article print "$$ActName: Posting article ...\n" if($Options{'v'}); - post(\@Article); - - # Test mode? - return if($Options{'t'}); - - # otherwise: update status data - print "$$ActName: Save status information.\n" if($Options{'v'}); - - open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!"; - print FH "##;; Lastpost: $day.$month.$year\n"; - print FH "##;; LastMID: $MID\n"; - close FH; + my $failure = post(\@Article); + + if ($failure) { + print "$$ActName: Posting failed, ERROR.dat may have more information.\n" if($Options{'v'} && (!defined($Options{'t'}) || $Options{'t'} !~ /console/i)); + } else { + updatestatus($ActName, $File, "$day.$month.$year", $MID) if !defined($Options{'t'}); + } } ################################## post ################################## @@ -308,42 +352,49 @@ sub postfaq { sub post { my ($ArticleR) = @_; + my ($failure) = -1; - # Test mode? + # test mode - print article to console if(defined($Options{'t'}) and $Options{'t'} =~ /console/i) { print "-----BEGIN--------------------------------------------------\n"; - print @$ArticleR; + print @$ArticleR; print "------END---------------------------------------------------\n"; - return; - } - - # pipe to script? - if(defined($Options{'s'})) { + # pipe article to script + } elsif(defined($Options{'s'})) { open (POST, "| $Options{'s'}") or die "$0: E: Cannot fork $Options{'s'}: $!\n"; print POST @$ArticleR; close POST; - return; - } - - my $NewsConnection = Net::NNTP->new($Config{'NNTPServer'}, Reader => 1) or die "$0: E: Can't connect to news server '$Config{'NNTPServer'}'!\n"; - $NewsConnection->authinfo ($Config{'NNTPUser'}, $Config{'NNTPPass'}) if (defined($Config{'NNTPUser'})); - $NewsConnection->post(); - $NewsConnection->datasend (@$ArticleR); - $NewsConnection->dataend(); - - # Posting failed? Save to ERROR.dat - if (!$NewsConnection->ok()) { - open FH, ">>ERROR.dat"; - print FH "\nPosting failed! Saving to ERROR.dat. Response from news server:\n"; - print FH $NewsConnection->code(); - print FH $NewsConnection->message(); - print FH "\n"; - print FH @$ArticleR; - print FH "-" x 80, "\n"; - close FH; + if ($? == 0) { + $failure = 0; + } else { + warn "$0: W: $Options{'s'} exited with status ", ($? >> 8), "\n"; + $failure = $?; + } + # post article + } else { + my $NewsConnection = Net::NNTP->new($Config{'NNTPServer'}, Reader => 1) or die "$0: E: Can't connect to news server '$Config{'NNTPServer'}'!\n"; + $NewsConnection->authinfo ($Config{'NNTPUser'}, $Config{'NNTPPass'}) if (defined($Config{'NNTPUser'})); + $NewsConnection->post(); + $NewsConnection->datasend (@$ArticleR); + $NewsConnection->dataend(); + + if ($NewsConnection->ok()) { + $failure = 0; + # Posting failed? Save to ERROR.dat + } else { + warn "$0: W: Posting failed!\n"; + open FH, ">>ERROR.dat"; + print FH "\nPosting failed! Saving to ERROR.dat. Response from news server:\n"; + print FH $NewsConnection->code(); + print FH $NewsConnection->message(); + print FH "\n"; + print FH @$ArticleR; + print FH "-" x 80, "\n"; + close FH; + } + $NewsConnection->quit(); } - - $NewsConnection->quit(); + return $failure; } #-------- sub getpgpcommand @@ -519,7 +570,7 @@ yapfaq - Post Usenet FAQs I<(yet another postfaq)> =head1 SYNOPSIS -B [B<-hvpd>] [B<-t> I | CONSOLE] [B<-f> I] [B<-s> I] +B [B<-hvpd>] [B<-t> I | CONSOLE] [B<-f> I] [B<-s> I] [B<-c> I<.rc file>] =head1 REQUIREMENTS @@ -555,7 +606,8 @@ headers as defined in its config file (by default F). F consists of one or more blocks, separated by C<=====> on a single line, each containing the configuration for one FAQ as a set -of definitions in the form of I. +of definitions in the form of I. Everything after a "#" +sign is ignored so you may comment your configuration file. =over 4 @@ -651,7 +703,7 @@ This setting is optional. =back -=head2 Example configuration file +=head3 Example configuration file # name of your project Name = 'testpost' @@ -707,12 +759,101 @@ This setting is optional. MID-Format = '<%n-%m.%y@domain.invalid>' Supersede = yes +=head3 Status Information + Information about the last post and about how to form message IDs for posts is stored in a file named F.cfg> which will be generated if it does not exist. Each of those status files will contain two lines, the first being the date of the last time the FAQ was posted and the second being the message ID of that incarnation. +=head2 Runtime Configuration + +Apart from configuring which FAQ(s) to post you may (re)set some +runtime configuration variables via the .rcfile (by default +F<.yapfaqrc>). F<.yapfaqrc> must contain one definition in the form of +I on each line; everything after a "#" sign is ignored. + +If you omit some settings they will be set to default values hardcoded +in F. + +B + +=over 4 + +=item B = I (mandatory) + +Host name of the NNTP server to post to. Must be set (or omitted; the +default is "localhost"); if set to en empty string, B falls +back to Perl's build-in defaults (contents of environment variables +NNTPSERVER and NEWSHOST; if not set, default from Net::Config; if not +set, "news" is used). + +=item B = I (optional) + +User name used for authentication with the NNTP server (I). + +This setting is optional; if it is not set, I is ignored and +no authentication is tried. + +=item B = I (optional) + +Password used for authentication with the NNTP server (I). + +This setting is optional; it must be set if I is present. + +=item B = I (optional) + +The Sender header that will be added to every posted message. + +This setting is optional. + +=item B = I (mandatory) + +The configuration file defining the FAQ(s) to post. Must be set (or +omitted; the default is "yapfaq.cfg"). + +=item B = I (optional) + +Boolean value (0 or 1) controlling whether the FAQs will get digitally +signed via an X-PGP-Sig header. + +This setting is optional; the default is 0. + +If you have set I to 1, you must also supply the necessary +information on your PGP oder GPG installation; please refer to the +sample F<.yapfaqrc> file (see below) for more information on this +topic. + +=back + +=head3 Example runtime configuration file + + NNTPServer = 'localhost' + NNTPUser = '' + NNTPPass = '' + Sender = '' + ConfigFile = 'yapfaq.cfg' + UsePGP = 0 + + ################################## PGP-Config ################################# + pgp = '/usr/bin/pgp' # path to pgp + PGPVersion = '2' # Use 2 for 2.X 5 for PGP > 2.X and GPG for GPG + PGPSigner = '' # sign as who? + PGPPass = '' # pgp2 only + PathtoPGPPass = '' # pgp2 pgp5 and gpg + pgpbegin = '-----BEGIN PGP SIGNATURE-----' # Begin of PGP-Signature + pgpend = '-----END PGP SIGNATURE-----' # End of PGP-Signature + pgptmpf = 'pgptmp' # temporary file for PGP. + pgpheader = 'X-PGP-Sig' + +=head3 Using more than one runtime configuration + +You may use more than one runtime configuration file with the B<-c> +option (see below). + =head1 OPTIONS =over 3 @@ -768,6 +909,13 @@ Instead of posting the article(s) to Usenet pipe them to the external I on STDIN (which may post the article(s) then). A return value of 0 will be considered success. +=item B<-c> I<.rc file> + +Load another runtime configuration file (.rc file) than F<.yaofaq.rc>. + +You may for example define another usenet server to post your FAQ(s) +to or load another configuration file defining (an)other FAQ(s). + =back =head1 EXAMPLES @@ -802,6 +950,10 @@ There are no special environment variables used by B. The script itself. +=item F<.yapfaqrc> + +Runtime configuration file for B. + =item F Configuration file for B. @@ -830,10 +982,9 @@ version of this program. Thomas Hochstein -Original author (until version 0.5b from 2003): +Original author (up to version 0.5b, dating from 2003): Marc Brockschmidt - =head1 COPYRIGHT AND LICENSE Copyright (c) 2003 Marc Brockschmidt