Browse Source

Install a sample /etc/default/mailmunge file.

master
Dianne Skoll 3 months ago
parent
commit
a2848afac4
Signed by: dianne GPG Key ID: 685A5A5E511D30E2
  1. 1
      DIST-CONTENTS
  2. 2
      Makefile.in
  3. 3
      configure
  4. 2
      configure.ac
  5. 66
      etc/default/mailmunge.sample.in
  6. 1
      sysvinit/mailmunge.in

1
DIST-CONTENTS

@ -60,6 +60,7 @@ docs/README
docs/architecture.odg
docs/architecture.svg
docs/style.css
etc/default/mailmunge.sample.in
examples/mailmunge-filter.pl.example
install-sh
logo/mailmunge-logo-for-dark-background.svg

2
Makefile.in

@ -88,6 +88,8 @@ distclean:: clean
install: all
$(MAKE) -C c install DESTDIR=$(DESTDIR)
$(MAKE) -C perl install DESTDIR=$(DESTDIR)
$(INSTALL) -d 755 $(DESTDIR)/etc/default
$(INSTALL) -m 644 etc/default/mailmunge.sample $(DESTDIR)/etc/default/mailmunge.sample
dist: FORCE
./tools/make-dist.sh $(VERSION)

3
configure

@ -4859,7 +4859,7 @@ CONFDIR_EVAL=`echo ${sysconfdir}${CONFSUBDIR}`
ac_config_files="$ac_config_files Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge"
ac_config_files="$ac_config_files Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge etc/default/mailmunge.sample"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -5564,6 +5564,7 @@ do
"systemd-units/mailmunge.service") CONFIG_FILES="$CONFIG_FILES systemd-units/mailmunge.service" ;;
"systemd-units/mailmunge-multiplexor.service") CONFIG_FILES="$CONFIG_FILES systemd-units/mailmunge-multiplexor.service" ;;
"sysvinit/mailmunge") CONFIG_FILES="$CONFIG_FILES sysvinit/mailmunge" ;;
"etc/default/mailmunge.sample") CONFIG_FILES="$CONFIG_FILES etc/default/mailmunge.sample" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac

2
configure.ac

@ -531,7 +531,7 @@ AC_SUBST(PERLINSTALLCONF)
AC_SUBST(PERLINSTALLSITECONF)
AC_SUBST(PERLINSTALLVENDORCONF)
AC_OUTPUT(Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge)
AC_OUTPUT(Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge etc/default/mailmunge.sample)
HERE=`pwd`
echo "*** Switching to perl/ directory and running $PERL Makefile.PL..."

66
etc/default/mailmunge.sample.in

@ -0,0 +1,66 @@
# These are the default settings for Mailmunge startup variables.
# Uncomment and change any that you want to set to a non-default value; then
# copy the result to /etc/default/mailmunge
# Anything that looks like:
# VAR=
# simply has an empty default value.
# MX_GROUP=@MMGROUP@
# MX_USER=@MMUSER@
# SPOOLDIR="@SPOOLDIR@
# SOCKET="@SPOOLDIR@/mailmunge.sock"
# MX_SOCKET="@SPOOLDIR@/mailmung-multiplexor.sock"
# MX_RELAY_CHECK=no
# MX_HELO_CHECK=no
# MX_SENDER_CHECK=no
# MX_RECIPIENT_CHECK=no
# ALLOW_CONNECTIONS_TO_QUEUE=no
# MX_QUEUE_SIZE=
# MX_QUEUE_TIMEOUT=
# MX_MINIMUM=2
# MX_MAXIMUM=10
# MX_WORKER_DELAY=
# MX_MIN_WORKER_DELAY=
# MX_MAX_LIFETIME=
# MX_REQUESTS=
# KEEP_FAILED_DIRECTORIES=no
# LOG_FILTER_TIME=no
# MM_ALLOW_GROUP_ACCESS=yes
# MM_CONSERVE_DESCRIPTORS=no
# MM_EQUIV_TO_LOOPBACK=
# MM_EXTRA=
# MM_LISTEN_BACKLOG=
# MM_PIDFILE=/var/run/mailmunge.pid
# MM_RESERVED_FOR_LOOPBACK=
# MM_SUPPRESS_REJECTED_RCPTS=no
# MX_BUSY=600
# MX_CMD_TIMEOUT=
# MX_EMBED_PERL=no
# MX_FILTER=
# MX_IDLE=
# MX_LISTEN_BACKLOG=
# MX_LOG=yes
# MX_LOG_WORKER_STATUS_INTERVAL=
# MX_MAP_SOCKET=
# MX_MAX_AS=
# MX_MAX_RSS=
# MX_NOTIFIER=
# MX_PARALLEL_TICKS=
# MX_PIDFILE=/var/run/mailmunge-multiplexor.pid
# MX_RECIPOK_PERDOMAIN=
# MX_STATS_SYSLOG=no
# MX_STATUS_UPDATES=no
# MX_SYSLOG_LABEL=
# MX_UNPRIV_SOCKET=
# SCANNED_BY=
# STRIP_BARE_CR=no
# SUPPRESS_SCANNED_BY=no
# SYSLOG_FACILITY=
# USE_SMFI_SETSYMLIST=yes

1
sysvinit/mailmunge.in

@ -147,7 +147,6 @@ start() {
`[ -n "$MX_MAXIMUM" ] && echo "-x $MX_MAXIMUM"` \
`[ -n "$MX_RECIPOK_PERDOMAIN" ] && echo "-y $MX_RECIPOK_PERDOMAIN"` \
`[ -n "$SPOOLDIR" ] && echo "-z $SPOOLDIR"` \
`[ -n "$MX_RECIPOK_PERDOMAIN_LIMIT" ] && echo "-y $MX_RECIPOK_PERDOMAIN_LIMIT"` \
-s $MX_SOCKET -o $SPOOLDIR/$prog-multiplexor.lock
if test $? = 0 ; then

Loading…
Cancel
Save