From cf42cf349cc11677d4d43aad523139261dd221ef Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 3 Feb 2018 13:36:09 +0100 Subject: [PATCH] Integrate Pandora with postfix --- pandora.sh | 3 ++- pandora/etc/init.d/pandora | 3 ++- pandora/srv/pandora/conf/local_settings.py | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pandora.sh b/pandora.sh index 5a2bd2c..23e4441 100755 --- a/pandora.sh +++ b/pandora.sh @@ -3,8 +3,9 @@ SOURCE_DIR=$(realpath $(dirname "${0}"))/pandora # Check prerequisites -docker image ls | grep -q rabbitmq || $(realpath $(dirname "${0}"))/rabbitmq.sh +docker image ls | grep -q postfix || $(realpath $(dirname "${0}"))/postfix.sh docker image ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh +docker image ls | grep -q rabbitmq || $(realpath $(dirname "${0}"))/rabbitmq.sh # Build Docker container docker build -t pandora ${SOURCE_DIR} diff --git a/pandora/etc/init.d/pandora b/pandora/etc/init.d/pandora index 9d356d7..ae6337f 100755 --- a/pandora/etc/init.d/pandora +++ b/pandora/etc/init.d/pandora @@ -4,7 +4,7 @@ description="Pan.do/ra docker container" depend() { need docker net - use dns logger netmount + use dns logger netmount postfix after postgres rabbitmq } @@ -12,6 +12,7 @@ start() { /usr/bin/docker run -d --rm \ --name pandora \ -h pandora \ + --link postfix \ --link postgres \ --link rabbitmq \ -p 127.0.0.1:8002:8002 \ diff --git a/pandora/srv/pandora/conf/local_settings.py b/pandora/srv/pandora/conf/local_settings.py index 3c8b877..0414cab 100644 --- a/pandora/srv/pandora/conf/local_settings.py +++ b/pandora/srv/pandora/conf/local_settings.py @@ -7,8 +7,12 @@ DATABASES = { 'PASSWORD': '${PANDORA_PWD}', } } -BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@rabbitmq:5672//pandora' DB_GIN_TRGM = True + +BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@rabbitmq:5672//pandora' + +EMAIL_HOST = 'postfix' + XACCELREDIRECT = True GOOGLE_API_KEY = 'AIzaSyBvIF3D550tlpL6o1xRrDurGo-81VhHlOw'