From 74023832736734185a1a62b271fbb997ce28f8b2 Mon Sep 17 00:00:00 2001
From: PJ <peterjan.brone@gmail.com>
Date: Tue, 14 Dec 2021 09:57:14 +0100
Subject: [PATCH] Add changelog, add env variables

---
 changelog/items/key-updates/abuse-scanner.md | 1 +
 dc                                           | 2 +-
 docker-compose.abuse.yml                     | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 changelog/items/key-updates/abuse-scanner.md

diff --git a/changelog/items/key-updates/abuse-scanner.md b/changelog/items/key-updates/abuse-scanner.md
new file mode 100644
index 00000000..75fba8f8
--- /dev/null
+++ b/changelog/items/key-updates/abuse-scanner.md
@@ -0,0 +1 @@
+- Add abuse scanner service, activated by adding `c` to `PORTAL_MODULES`
diff --git a/dc b/dc
index fd37207f..231f5aaf 100755
--- a/dc
+++ b/dc
@@ -15,7 +15,7 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do
 
   # abuse module - alias "c"
   if [[ ${PORTAL_MODULES:i-1:1} == "c" ]]; then
-    COMPOSE_FILES+=" -f docker-compose.abuse.yml"
+    COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse.yml"
   fi
 
   # blocker module - alias "b"
diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml
index 14bc1f34..dea061c2 100644
--- a/docker-compose.abuse.yml
+++ b/docker-compose.abuse.yml
@@ -17,7 +17,14 @@ services:
     env_file:
       - .env
     environment:
-      - BLOCKER_API_URL=blocker:4000
+      - ABUSE_LOG_LEVEL=${ABUSE_LOG_LEVEL}
+      - ABUSE_SPONSOR=${ABUSE_SPONSOR}
+      - BLOCKER_API_URL=${BLOCKER_API_URL}
+      - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER}
+      - EMAIL_SERVER=${EMAIL_SERVER}
+      - EMAIL_USERNAME=${EMAIL_USERNAME}
+      - EMAIL_PASSWORD=${EMAIL_PASSWORD}
+      - MONGO_CONNECTIONSTRING=${MONGO_CONNECTIONSTRING}
     networks:
       shared:
         ipv4_address: 10.10.10.110