masqmail

changeset 37:4fee89792559

updated config example and man page to new default online file
author meillo@marmaro.de
date Mon, 10 May 2010 10:39:28 +0200
parents 9cb4031fa5e0
children ac0233b5f6f8
files docs/masqmail.conf.5 examples/masqmail.conf
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line diff
     1.1 --- a/docs/masqmail.conf.5	Fri May 07 16:44:26 2010 +0200
     1.2 +++ b/docs/masqmail.conf.5	Mon May 10 10:39:28 2010 +0200
     1.3 @@ -351,9 +351,9 @@
     1.4  The file should only exist when there is currently a connection.
     1.5  Create it in your ip-up script with e.g.
     1.6  
     1.7 -echo \-n <name> > /tmp/connect_route
     1.8 +echo \-n <name> > /var/run/masqmail/masqmail-route
     1.9  
    1.10 -chmod 0644 /tmp/connect_route
    1.11 +chmod 0644 /var/run/masqmail/masqmail-route
    1.12  
    1.13  Do not forget to delete it in your ip-down script.
    1.14  
    1.15 @@ -368,9 +368,9 @@
    1.16  
    1.17  #!/bin/sh
    1.18  
    1.19 -[ \-e /tmp/connect_route ] || exit 1
    1.20 +[ \-e /var/run/masqmail/masqmail-route ] || exit 1
    1.21  
    1.22 -cat /tmp/connect_route
    1.23 +cat /var/run/masqmail/masqmail-route
    1.24  
    1.25  exit 0
    1.26  
     2.1 --- a/examples/masqmail.conf	Fri May 07 16:44:26 2010 +0200
     2.2 +++ b/examples/masqmail.conf	Mon May 10 10:39:28 2010 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4 -# Example configuration for MasqMail
     2.5 +# Example configuration for masqmail
     2.6  # Copyright (C) 1999 Oliver Kurth
     2.7  #
     2.8  # This program is free software; you can redistribute it and/or modify
     2.9 @@ -16,7 +16,7 @@
    2.10  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    2.11  #
    2.12  
    2.13 -# The name with which MasqMail identifies itself to others:
    2.14 +# The name with which masqmail identifies itself to others:
    2.15  # CHANGING THIS IS REQUIRED!
    2.16  host_name="striped.patchwork.net"
    2.17  
    2.18 @@ -38,7 +38,7 @@
    2.19  # probably this will also be configurable on host basis in future versions.
    2.20  remote_port=25
    2.21  
    2.22 -# where MasqMail stores its spool files and other stuff:
    2.23 +# where masqmail stores its spool files and other stuff:
    2.24  spool_dir="/var/spool/masqmail"
    2.25  
    2.26  # where local mail will be written to:
    2.27 @@ -61,7 +61,7 @@
    2.28  
    2.29  # for 'file' uncomment next 2 lines
    2.30  #online_detect = file
    2.31 -#online_file = "/tmp/connect_route"
    2.32 +#online_file = "/var/run/masqmail/masqmail-route"
    2.33  
    2.34  #
    2.35  # example for local delivery to an mda: