From 62b02a7500e8f7962c8f5526135daa0fab1f5529 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Wed, 30 May 2018 11:20:55 +0000
Subject: [PATCH] add hpfeeds support
---
docker/mailoney/Dockerfile | 8 +++++---
docker/mailoney/docker-compose.yml | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docker/mailoney/Dockerfile b/docker/mailoney/Dockerfile
index a4984d57..9b62c772 100644
--- a/docker/mailoney/Dockerfile
+++ b/docker/mailoney/Dockerfile
@@ -22,7 +22,9 @@ RUN apk -U --no-cache add \
# Install libemu python wrapper
pip install --no-cache-dir --upgrade pip && \
- pip install --no-cache-dir pylibemu && \
+ pip install --no-cache-dir \
+ hpfeeds \
+ pylibemu && \
# Install mailoney from git
git clone --depth=1 https://github.com/awhitehatter/mailoney /opt/mailoney && \
@@ -43,7 +45,7 @@ RUN apk -U --no-cache add \
rm -rf /root/* && \
rm -rf /var/cache/apk/*
-# Set workdir and start glastopf
+# Set workdir and start mailoney
USER mailoney:mailoney
WORKDIR /opt/mailoney/
-CMD ["/usr/bin/python","mailoney.py","-i","0.0.0.0","-p","25","-s","mailserver","-t","schizo_open_relay"]
+CMD ["/usr/bin/python","mailoney.py","-i","0.0.0.0","-p","25","-s","mailrelay.local","-t","schizo_open_relay"]
diff --git a/docker/mailoney/docker-compose.yml b/docker/mailoney/docker-compose.yml
index 97947d68..b8d1d786 100644
--- a/docker/mailoney/docker-compose.yml
+++ b/docker/mailoney/docker-compose.yml
@@ -10,6 +10,12 @@ services:
build: .
container_name: mailoney
restart: always
+ environment:
+ - HPFEEDS_SERVER=
+ - HPFEEDS_IDENT=user
+ - HPFEEDS_SECRET=pass
+ - HPFEEDS_PORT=20000
+ - HPFEEDS_CHANNELPREFIX=prefix
stop_signal: SIGINT
networks:
- mailoney_local