Skip to content

Remove socketee support #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −24
Open

Remove socketee support #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,4 @@ COPY lib/ /usr/local/lib/site_ruby/
COPY boot /sbin/
COPY fake-pups /pups/bin/pups

RUN curl -sL https://github.com/discourse/socketee/releases/download/v0.0.2/socketee -o /usr/local/bin/socketee \
&& echo '7cd6df7aeeac0cce35c84e842b3cda5a4c36a301 /usr/local/bin/socketee' | sha1sum -c - \
&& chmod 0755 /usr/local/bin/socketee

CMD ["/sbin/boot"]
14 changes: 0 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,6 @@ The `BLACKLISTED_SENDER_DOMAINS` environment variable accepts a
space-separated list of domain names. Mail messages from these senders will
be fast-failed with SMTP code 554.


## Syslog integration

Postfix loves to log everything to syslog. In fact, that's really all it
supports. Since, by default, Docker is not known for its superlative
out-of-the-box syslog integration, this container runs a tiny script which
reads all syslog data and dumps it to the container's `stderr` (which is
then examinable by `docker logs`).

If, by some chance, you want to process your Postfix logs more extensively,
you can set `SOCKETEE_RELAY_SOCKET` and all syslog messages will also be
sent to that socket for further processing.


# Theory of Operation

Every e-mail that is received is delivered to a custom `discourse` service.
Expand Down
12 changes: 6 additions & 6 deletions boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

set -e

# Send syslog messages to stderr, optionally relaying them to another socket
# for postfix-exporter to take a look at
if [ -z "$SOCKETEE_RELAY_SOCKET" ]; then
/usr/bin/socat UNIX-RECV:/dev/log,mode=0666 stderr &
else
/usr/local/bin/socketee /dev/log "$SOCKETEE_RELAY_SOCKET" &
if [ "$SOCKETEE_RELAY_SOCKET" ]; then
echo "FATAL ERROR: You have defined SOCKETEE_RELAY_SOCKET which is no longer supported" >&2
exit 1
fi

# Send syslog messages to stderr
/usr/bin/socat UNIX-RECV:/dev/log,mode=0666 stderr &

echo "Operating environment:" >&2
env >&2

Expand Down