# HG changeset patch # User meillo@marmaro.de # Date 1273480768 -7200 # Node ID 4fee897925596fb718b04016ceae1bb500ed2962 # Parent 9cb4031fa5e08d7ff34ba6489c616563a32876c5 updated config example and man page to new default online file diff -r 9cb4031fa5e0 -r 4fee89792559 docs/masqmail.conf.5 --- a/docs/masqmail.conf.5 Fri May 07 16:44:26 2010 +0200 +++ b/docs/masqmail.conf.5 Mon May 10 10:39:28 2010 +0200 @@ -351,9 +351,9 @@ The file should only exist when there is currently a connection. Create it in your ip-up script with e.g. -echo \-n > /tmp/connect_route +echo \-n > /var/run/masqmail/masqmail-route -chmod 0644 /tmp/connect_route +chmod 0644 /var/run/masqmail/masqmail-route Do not forget to delete it in your ip-down script. @@ -368,9 +368,9 @@ #!/bin/sh -[ \-e /tmp/connect_route ] || exit 1 +[ \-e /var/run/masqmail/masqmail-route ] || exit 1 -cat /tmp/connect_route +cat /var/run/masqmail/masqmail-route exit 0 diff -r 9cb4031fa5e0 -r 4fee89792559 examples/masqmail.conf --- a/examples/masqmail.conf Fri May 07 16:44:26 2010 +0200 +++ b/examples/masqmail.conf Mon May 10 10:39:28 2010 +0200 @@ -1,4 +1,4 @@ -# Example configuration for MasqMail +# Example configuration for masqmail # Copyright (C) 1999 Oliver Kurth # # This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# The name with which MasqMail identifies itself to others: +# The name with which masqmail identifies itself to others: # CHANGING THIS IS REQUIRED! host_name="striped.patchwork.net" @@ -38,7 +38,7 @@ # probably this will also be configurable on host basis in future versions. remote_port=25 -# where MasqMail stores its spool files and other stuff: +# where masqmail stores its spool files and other stuff: spool_dir="/var/spool/masqmail" # where local mail will be written to: @@ -61,7 +61,7 @@ # for 'file' uncomment next 2 lines #online_detect = file -#online_file = "/tmp/connect_route" +#online_file = "/var/run/masqmail/masqmail-route" # # example for local delivery to an mda: