Skip to content

Commit

Permalink
Make ready for release; Update example service scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
mpaperno committed Aug 6, 2021
1 parent fbedea9 commit 353a7b0
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 18 deletions.
3 changes: 0 additions & 3 deletions .github/FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SpamPD Change Log
! : important change, change of default behavior, etc.
-----------------------------------------------------------

2.61 (3-Aug-21)
2.61 (6-Aug-21)

Bug fixes, new features, and some optimization. Thanks to Simon Matter for reporting, suggestions, and testing!

Expand Down
6 changes: 6 additions & 0 deletions misc/spampd-rh-rc-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
#
# This script starts and stops the spampd daemon
#
#### NOTE #####
# This is a very old and outdated example!!!
# Recommend checking the Debian version of spampd.init script,
# in the /debian branch of the source repository
# (https://github.com/mpaperno/spampd/tree/debian).
#
# chkconfig: 2345 80 30
#
# description: spampd is a daemon process which uses SpamAssassin to check
Expand Down
15 changes: 12 additions & 3 deletions misc/spampd.service
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
[Unit]
Description=Spamassassin Proxy Daemon
After=network.target
Description=Spam Proxy Daemon
After=syslog.target network.target

[Service]
ExecStart=/usr/bin/spampd --port=10025 --relayhost=127.0.0.1:10026 --tagall --log-rules-hit --user spampd --group spampd --pid=/home/spampd/spampd.pid --nodetach
ExecStart=/usr/sbin/spampd --config /etc/spampd.cfg --pid /run/spampd.pid --nodetach
ExecReload=/usr/bin/kill -HUP $MAINPID
KillMode=mixed
KillSignal=SIGQUIT
TimeoutStopSec=30
Restart=on-failure
# To run as a forking server, uncomment below and remove the "--nodetach" option
# from the command line above. You may need/want to add "--setsid" option instead.
#Type=forking
#PIDFile=/run/spampd.pid

[Install]
WantedBy=multi-user.target
20 changes: 10 additions & 10 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# SpamPD
# SpamPD - Spam Proxy Daemon

Originally released in May of 2002, SpamPD is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content.
It uses an excellent program called <a href="https://spamassassin.apache.org/" target="_new">SpamAssassin</a> (SA) to do the actual message scanning. SpamPD acts as a transparent SMTP/LMTP proxy between
two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then SpamPD will ask SA to
add some headers and a report to the message indicating it's spam and why. SpamPD is written in Perl and should theoretically run on any
Originally released in May of 2002, _SpamPD_ is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail (UCE, aka spam) content.
It uses an excellent program called <a href="https://spamassassin.apache.org/" target="_new">SpamAssassin</a> (SA) to do the actual message scanning. SpamPD acts as a transparent SMTP/LMTP proxy between
two mail servers, and during the transaction it passes the mail through SA. If SA decides the mail could be spam, then SpamPD will ask SA to
add some headers and a report to the message indicating it's spam and why. SpamPD is written in Perl and should theoretically run on any
platform supported by Perl and SpamAssassin.

Check the [Releases](https://github.com/mpaperno/spampd/releases) area for latest versions, and see the old
<a href="https://github.com/mpaperno/spampd/downloads">Downloads</a> section for older releases.
Check the [Releases](https://github.com/mpaperno/spampd/releases) area for latest versions, and see the old
[Downloads](https://github.com/mpaperno/spampd/downloads) section for older releases (and the "previous-versions" folder for some even more ancient ones).
Recently the Debian package version was added to this repo as a branch, and those tags will also show up in the Releases page.

Please read the [POD file](https://github.com/mpaperno/spampd/blob/master/spampd.pod) for full documentation of the many available options.
Please read the [POD file](https://github.com/mpaperno/spampd/blob/master/spampd.pod) for full documentation of the many available options.
See the [changelog](https://github.com/mpaperno/spampd/blob/master/changelog.txt) for version history.

More historic background information is available <a href="http://www.worlddesign.com/index.cfm/page/rd/mta/spampd.htm">here</a>.
More historic background information is available <a href="http://www.worlddesign.com/index.cfm/page/rd/mta/spampd.htm" target="_new">here</a>.

Linux packages data courtesy of Repology:

<a href="https://repology.org/metapackage/spampd/versions" target="_new">
<img src="https://repology.org/badge/vertical-allrepos/spampd.svg?minversion=2.60&header=Latest+release+v2.60" alt="Packaging status">
<img src="https://repology.org/badge/vertical-allrepos/spampd.svg?minversion=2.61&header=Latest+release+v2.61" alt="Packaging status">
</a>
2 changes: 1 addition & 1 deletion spampd.pl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
######################
# SpamPD - Spam Proxy Daemon
#
# v2.61 - 03-Aug-21
# v2.61 - 06-Aug-21
# v2.60 - 26-Jul-21
# v2.53 - 25-Feb-19
# v2.52 - 10-Nov-18
Expand Down

0 comments on commit 353a7b0

Please sign in to comment.