patch-etc_mailscanner_conf_with_mcp 3.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  1. $OpenBSD: patch-etc_mailscanner_conf_with_mcp,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
  2. --- etc/mailscanner.conf.with.mcp.orig Wed May 30 12:30:39 2007
  3. +++ etc/mailscanner.conf.with.mcp Sun Aug 5 04:03:26 2007
  4. @@ -31,17 +31,17 @@
  5. #
  6. # Set the directory containing all the reports in the required language
  7. -%report-dir% = /opt/MailScanner/etc/reports/en
  8. +%report-dir% = %SYSCONFDIR%/MailScanner/reports/en
  9. # Configuration directory containing this file
  10. -%etc-dir% = /opt/MailScanner/etc
  11. +%etc-dir% = %SYSCONFDIR%/MailScanner
  12. # Rulesets directory containing your ".rules" files
  13. -%rules-dir% = /opt/MailScanner/etc/rules
  14. +%rules-dir% = %SYSCONFDIR%/MailScanner/rules
  15. # Configuration directory containing files related to MCP
  16. # (Text Content Protection)
  17. -%mcp-dir% = /opt/MailScanner/etc/mcp
  18. +%mcp-dir% = %SYSCONFDIR%/MailScanner/mcp
  19. #
  20. # System settings
  21. @@ -86,7 +86,7 @@ Queue Scan Interval = 5
  22. # Example: /var/spool/mqueue.in/*
  23. # 3. The name of a file containing a list of directory names,
  24. # which can in turn contain wildcards.
  25. -# Example: /opt/MailScanner/etc/mqueue.in.list.conf
  26. +# Example: %SYSCONFDIR%/MailScanner/mqueue.in.list.conf
  27. #
  28. Incoming Queue Dir = /var/spool/mqueue.in
  29. @@ -102,7 +102,7 @@ Incoming Work Dir = /var/spool/MailScanner/incoming
  30. Quarantine Dir = /var/spool/MailScanner/quarantine
  31. # Set where to store the process id number so you can stop MailScanner
  32. -PID file = /opt/MailScanner/var/MailScanner.pid
  33. +PID file = /var/run/MailScanner.pid
  34. # To avoid resource leaks, re-start periodically
  35. Restart Every = 14400
  36. @@ -115,7 +115,7 @@ MTA = sendmail
  37. # Set how to invoke MTA when sending messages MailScanner has created
  38. # (e.g. to sender/recipient saying "found a virus in your message")
  39. # This can also be the filename of a ruleset.
  40. -Sendmail = /usr/lib/sendmail
  41. +Sendmail = /usr/sbin/sendmail
  42. # Sendmail2 is provided for Exim users.
  43. # It is the command used to attempt delivery of outgoing cleaned/disinfected
  44. @@ -123,9 +123,9 @@ Sendmail = /usr/lib/sendmail
  45. # This is not usually required for sendmail.
  46. # This can also be the filename of a ruleset.
  47. #For Exim users: Sendmail2 = /usr/sbin/exim -C /etc/exim/exim_send.conf
  48. -#For sendmail users: Sendmail2 = /usr/lib/sendmail
  49. +#For sendmail users: Sendmail2 = /usr/sbin/sendmail
  50. #Sendmail2 = /usr/sbin/sendmail -C /etc/exim/exim_send.conf
  51. -Sendmail2 = /usr/lib/sendmail
  52. +Sendmail2 = /usr/sbin/sendmail
  53. #
  54. # Processing Incoming Mail
  55. @@ -169,7 +169,7 @@ Deliver Unparsable TNEF = no
  56. # may be. It helps protect against Denial Of Service attacks in TNEF files.
  57. #TNEF Expander = internal
  58. # This can also be the filename of a ruleset.
  59. -TNEF Expander = /opt/MailScanner/bin/tnef --maxsize=100000000
  60. +TNEF Expander = %PREFIX%/bin/tnef --maxsize=100000000
  61. # The maximum length of time the TNEF Expander is allowed to run for 1 message.
  62. # (in seconds)
  63. @@ -1107,11 +1107,11 @@ Log Permitted Filetypes = no
  64. SpamAssassin User State Dir =
  65. # This setting is useful if SpamAssassin is installed in an unusual place,
  66. -# e.g. /opt/MailScanner. The install prefix is used to find some fallback
  67. +# e.g. %PREFIX%. The install prefix is used to find some fallback
  68. # directories if neither of the following two settings work.
  69. # If this is set then it adds to the list of places that are searched;
  70. # otherwise it has no effect.
  71. -#SpamAssassin Install Prefix = /opt/MailScanner
  72. +#SpamAssassin Install Prefix = %PREFIX%
  73. SpamAssassin Install Prefix =
  74. # The site-local rules are searched for here, and in prefix/etc/spamassassin,