From b406c9b4e0913e66812cb9d9efead3eaef4cfd18 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Fri, 25 May 2018 16:18:05 +0000
Subject: [PATCH] include hpfeeds support
thank you @vorband
---
docker/rdpy/Dockerfile | 19 ++++++++++++-------
docker/rdpy/docker-compose.yml | 8 ++++++++
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/docker/rdpy/Dockerfile b/docker/rdpy/Dockerfile
index fcfc476e..71c4fe12 100644
--- a/docker/rdpy/Dockerfile
+++ b/docker/rdpy/Dockerfile
@@ -21,23 +21,28 @@ RUN apk -U --no-cache add \
addgroup -g 2000 rdpy && \
adduser -S -s /bin/ash -u 2000 -D -g 2000 rdpy && \
-# Install rdpy from git
- cd /home/rdpy && \
- git clone --depth=1 https://github.com/t3chn0m4g3/rdpy && \
+# Install deps
pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir --upgrade cffi && \
pip install --no-cache-dir \
+ hpfeeds \
twisted \
pyopenssl \
qt4reactor \
service_identity \
- rsa pyasn1 && \
+ rsa \
+ pyasn1 && \
+
+# Install rdpy from git
+ mkdir /opt && \
+ cd /opt && \
+ git clone --depth=1 https://github.com/t3chn0m4g3/rdpy && \
cd rdpy && \
python setup.py install && \
# Setup user, groups and configs
- cp /root/dist/* /home/rdpy/ && \
- chown rdpy:rdpy -R /home/rdpy/* && \
+ cp /root/dist/* /opt/rdpy/ && \
+ chown rdpy:rdpy -R /opt/rdpy/* && \
mkdir -p /var/log/rdpy && \
# Clean up
@@ -53,4 +58,4 @@ RUN apk -U --no-cache add \
# Start rdpy
USER rdpy:rdpy
-CMD exec /usr/bin/python2 -i /usr/bin/rdpy-rdphoneypot.py /home/rdpy/$(shuf -i 1-3 -n 1) >> /var/log/rdpy/rdpy.log
+CMD exec /usr/bin/python2 -i /usr/bin/rdpy-rdphoneypot.py /opt/rdpy/$(shuf -i 1-3 -n 1) >> /var/log/rdpy/rdpy.log
diff --git a/docker/rdpy/docker-compose.yml b/docker/rdpy/docker-compose.yml
index 622a5948..26469115 100644
--- a/docker/rdpy/docker-compose.yml
+++ b/docker/rdpy/docker-compose.yml
@@ -9,7 +9,15 @@ services:
rdpy:
build: .
container_name: rdpy
+ extra_hosts:
+ - hpfeeds.example.com:10.20.30.40
restart: always
+ environment:
+ - HPFEEDS_SERVER=hpfeeds.example.com
+ - HPFEEDS_IDENT=user
+ - HPFEEDS_SECRET=pass
+ - HPFEEDS_PORT=80
+ - SERVERID=id
networks:
- rdpy_local
ports: