From 677367d728c03a28070e29fcc6adac8edca6d636 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 4 Sep 2015 14:19:50 +0200 Subject: spamd - code style cleanup and multiple fixes - Fix copyright header - Remove service and menu tags that are already specified in packages configfile (spamd.xml) - Nuke useless comments - Make descriptions readable - Fix default values handling - Remove completely bogus "Enable RRD graphing" option that had no code attached to it. - Indentation/whitespace fixes --- config/spamd/spamd_settings.xml | 218 +++++++++++++++++++++++----------------- 1 file changed, 124 insertions(+), 94 deletions(-) (limited to 'config/spamd') diff --git a/config/spamd/spamd_settings.xml b/config/spamd/spamd_settings.xml index 225ef4a6..a3387279 100644 --- a/config/spamd/spamd_settings.xml +++ b/config/spamd/spamd_settings.xml @@ -1,62 +1,51 @@ - - + + - - + - - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +/* ====================================================================================== */ + ]]> + spamdsettings - 1.1.1 + 1.1.5 SpamD: Settings pkg_edit.php?xml=spamd_settings.xml&id=0 /usr/local/pkg/spamd.inc - - - SpamD -
Services
- spamd.xml - - - spamd - spamd.sh - spamd - SpamD External Sources @@ -76,18 +65,12 @@ /spamd_db.php - ['installedpackages']['spamd']['config'] - - Intercept on interfaces + Intercept on Interfaces spamdbinds_array - - - + These are the interfaces SpamD will intercept SMTP connections on. interfaces_selection true loopback @@ -97,71 +80,119 @@ identifier The SMTP version banner that is reported upon initial connection. input - + - Maximum blacklisted connections + Maximum Blacklisted Connections maxblack - The maximum number of concurrent blacklisted connections to allow in greylisting mode. This value may not be greater than maxcon (see below). The default is maxcon - 100. + + + (Default: 'Max Concurrent Connections' - 100) + ]]> + input + 10 - Max concurrent connections + Max Concurrent Connections maxcon - The maximum number of concurrent connections to allow. The default is 800. + + + (Default: 800) + ]]> + input - 800 + 10 + 800 - Grey listing + Greylisting greylisting - Connections from addresses not blacklisted on the black lists tab will be considered for greylisting. Such connections will not be stuttered at (though see the stutter secs option) or delayed, and will receive the pleasantly innocuous temporary failure. After passtime if the host returns it will be added to the white list. + + + checkbox - yes + passtime,greyexp,whiteexp + on Passtime passtime - Adjust the three time parameters for greylisting. Passtime defaults to 25 (minutes). After passtime minutes if spamd sees a retried attempt to deliver mail for the same tuple, spamd will whitelist the connecting address by adding it as a whitelist entry. + + + (Default: 25 minutes) + ]]> + input - 30 - 25:4:864 + 5 + 25 Grey Expiration greyexp - Adjust the three time parameters for greylisting. Grey expiration defaults to 4. SpamD removes connection entries from the database if delivery has not been retried within greyexp hours from the initial time a connection is seen. + + + (Default: 4 hours) + ]]> + input - 30 - 25:4:864 + 5 + 4 White Exp whiteexp - Adjust the three time parameters for greylisting. White expiration defaults to 864 (hours, approximately 36 days). SpamD removes whitelist entries from the database if no mail delivery activity has been seen from the whitelisted address within whiteexp hours from the initial time an address is whitelisted. + + + (Default: 864 hours - approximately 36 days) + ]]> + input - 30 - 25:4:864 + 5 + 864 Stutter Secs stuttersecs - Stutter at greylisted connections for the specified amount of seconds, after which the connection is not stuttered at. Defaults to 10. + + + (Defaults: 10 seconds) + ]]> + input - 10 + 5 + 10 Delay Secs delaysecs - Delay each character sent to the client by the specified amount of seconds. Defaults to 1. + + + (Default: 1 second) + ]]> + input - 1 + 5 + 1 Window Size window Set the socket receive buffer to this many bytes, adjusting the window size. input - NextMTA nextmta - Automatically sends messages after being processed by SpamD to IP Address. You may enter an alias if you like, simply prepend $ to the alias name. example: $mailservers. Note, if you have postfix package installed enter 127.0.0.1 here. + + + (Example: $mailservers)
+ Note: If you have postfix package installed, enter 127.0.0.1 here.
+ ]]> + input - 1 + on - - Enable RRD graphing - enablerrd - Enables the graphing of SpamD connection and disconnection statistics. - checkbox - - spamd_validate_input($_POST, $input_errors); - + sync_package_spamd(); - \ No newline at end of file + -- cgit v1.2.3