diff --git a/dc b/dc index 231f5aaf..648621fd 100755 --- a/dc +++ b/dc @@ -13,11 +13,6 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.accounts.yml" fi - # abuse module - alias "c" - if [[ ${PORTAL_MODULES:i-1:1} == "c" ]]; then - COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse.yml" - fi - # blocker module - alias "b" if [[ ${PORTAL_MODULES:i-1:1} == "b" ]]; then COMPOSE_FILES+=" -f docker-compose.blocker.yml" @@ -28,10 +23,15 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do COMPOSE_FILES+=" -f docker-compose.jaeger.yml" fi - # mongodb module - alias "m". implied by "a" + # mongodb module - alias "m". implied by "a" or "u" if [[ ${PORTAL_MODULES:i-1:1} == "m" ]]; then COMPOSE_FILES+=" -f docker-compose.mongodb.yml" fi + + # abuse module - alias "u" + if [[ ${PORTAL_MODULES:i-1:1} == "u" ]]; then + COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse.yml" + fi done # override file if exists diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 44e00ab1..87af6718 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -20,15 +20,19 @@ services: - ABUSE_LOG_LEVEL=${ABUSE_LOG_LEVEL} - ABUSE_MAILBOX=${ABUSE_MAILBOX} - ABUSE_SPONSOR=${ABUSE_SPONSOR} - - BLOCKER_API_URL=${BLOCKER_API_URL} + - BLOCKER_IP=${BLOCKER_IP} + - BLOCKER_PORT=${BLOCKER_PORT} - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} - EMAIL_SERVER=${EMAIL_SERVER} - EMAIL_USERNAME=${EMAIL_USERNAME} - EMAIL_PASSWORD=${EMAIL_PASSWORD} - - MONGO_CONNECTIONSTRING=${MONGO_CONNECTIONSTRING} + - SKYNET_DB_HOST=${SKYNET_DB_HOST} + - SKYNET_DB_PORT=${SKYNET_DB_PORT} + - SKYNET_DB_USER=${SKYNET_DB_USER} + - SKYNET_DB_PASS=${SKYNET_DB_PASS} networks: shared: - ipv4_address: 10.10.10.110 + ipv4_address: 10.10.10.120 depends_on: - mongo - blocker