diff options
| -rwxr-xr-x | localmkpostfixvirtual | 17 | ||||
| -rwxr-xr-x | localwebstats | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/localmkpostfixvirtual b/localmkpostfixvirtual index 654de19..f04987c 100755 --- a/localmkpostfixvirtual +++ b/localmkpostfixvirtual @@ -3,7 +3,7 @@ # /usr/local/sbin/localmkpostfixvirtual # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: localmkpostfixvirtual,v 1.5 2002-03-07 16:22:51 jonas Exp $ +# $Id: localmkpostfixvirtual,v 1.6 2002-07-20 18:30:19 jonas Exp $ # # Generate virtual file for postfix # @@ -11,11 +11,18 @@ # # Each user should have space-separated hints like "mailname1@ mailname2@gid1 mailname3@gid2". # -# The user of each mailgroup should have hints like "@domain1 @domain2" for each hosted domain. +# The user of each mailgroup should have hints like "@domain1 @domain2" +# for each hosted domain. # -# Optional: root can have hints like "postmaster@ hostmaster@ support@" (default: "postmaster@"). +# Optional: More than one mailgroup can be grouped: List them all in +# "Office" or "roomnumber" field of primary mailgroup (include the +# primary mailgroup itself!). +# +# Optional: root can have hints like "postmaster@ hostmaster@ support@" +# (default: "postmaster@"). # # TODO: reuse getent requests (drastically improves speed) +# TODO: Write command "members" as internal code # function get_fullname_field() { getent passwd $1 | awk -F: '{print $5}' | awk -F, '{print $1}'; } @@ -48,7 +55,9 @@ for gid in $@; do fi echo mailusers="" - for mailgroup in `get_roomnumber_field $gid`; do + mailgroups=`get_roomnumber_field $gid` + [ -z "$mailgroups" ] || mailgroups=$gid + for mailgroup in $mailgroups; do mailusers="$mailusers `members $mailgroup`" done # for uid in `members $gid | sort`; do diff --git a/localwebstats b/localwebstats index 0e17e5b..e9041c2 100755 --- a/localwebstats +++ b/localwebstats @@ -3,7 +3,7 @@ # /usr/local/sbin/localwebstats # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: localwebstats,v 1.18 2002-03-18 20:12:07 jonas Exp $ +# $Id: localwebstats,v 1.19 2002-07-20 18:30:19 jonas Exp $ # # Webstats maintenance script # @@ -284,7 +284,7 @@ inputfile = - # Instead, put additions/overrides in $AWSTATS_CFG.local LogFile=\"$LOGDATATMP\" -LogFormat=4 +LogFormat=1 DNSLookup=0 DirData=\"$STATSDIR/awstats\" AllowToUpdateStatsFromBrowser=0 |