INN commit: trunk (doc/pod/news.pod scripts/innshellvars.in)

INN Commit Russ_Allbery at isc.org
Sun Dec 14 18:35:47 UTC 2008


    Date: Sunday, December 14, 2008 @ 10:35:46
  Author: iulius
Revision: 8238

Fix exports.
Add $UMASK and $SYSLOG_FACILITY.
Rename $SPOOLBASE to $SPOOLDIR.

see #10

Modified:
  trunk/doc/pod/news.pod
  trunk/scripts/innshellvars.in

-------------------------+
 doc/pod/news.pod        |    7 +++++++
 scripts/innshellvars.in |   11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2008-12-14 18:34:07 UTC (rev 8237)
+++ doc/pod/news.pod	2008-12-14 18:35:46 UTC (rev 8238)
@@ -22,6 +22,13 @@
 The I<nntpactsync> parameter has been renamed to I<incominglogfrequency>
 in F<inn.conf>; B<innupgrade> handles this renaming during the update.
 
+=item *
+
+The $SPOOLBASE variable has been renamed to $SPOOLDIR in B<innshellvars>
+in order to be more consistent.  It impacts shell scripts only.  If you
+import B<innshellvars> and use that variable in your scripts, you will have
+to rename it.
+
 =back
 
 =head1 Changes in 2.5.0

Modified: scripts/innshellvars.in
===================================================================
--- scripts/innshellvars.in	2008-12-14 18:34:07 UTC (rev 8237)
+++ scripts/innshellvars.in	2008-12-14 18:35:46 UTC (rev 8238)
@@ -1,5 +1,5 @@
 #! /bin/sh
-##  $Revision$
+##  $Id$
 ##  Set up any and all shell variables that an INN shell script
 ##  might need.  Also sets umask.
 
@@ -12,16 +12,16 @@
 eval `@bindir@/innconfval -s`
 
 NEWSHOME=${PATHNEWS}
-SPOOLBASE=${PATHSPOOL}
+SPOOLDIR=${PATHSPOOL}
 MOST_LOGS=${PATHLOG}
-export NEWSHOME SPOOL MOST_LOGS
+export NEWSHOME SPOOLDIR MOST_LOGS
 
 NEWSBIN=${PATHBIN}
 NEWSETC=${PATHETC}
 NEWSLIB=@libdir@
 INNDDIR=${PATHRUN}
 LOCKS=${PATHRUN}
-export NEWSBIN NEWSETC INNDDIR NEWSHOME
+export NEWSBIN NEWSETC NEWSLIB INNDDIR LOCKS
 
 ERRLOG=${MOST_LOGS}/errlog
 LOG=${MOST_LOGS}/news
@@ -113,8 +113,11 @@
 NEWSLBIN=${NEWSHOME}/local
 export NEWSLBIN
 
+UMASK=@NEWSUMASK@
 umask @NEWSUMASK@
 
+SYSLOG_FACILITY=`echo "@SYSLOG_FACILITY@" | tr "[:upper:]" "[:lower:]" | ${SED} -e 's/log_//'`
+
 PATH=${NEWSLBIN}:${NEWSBIN}:${PATH}:/bin:/usr/bin
 export PATH
 




More information about the inn-committers mailing list