Skip to content

Commit

Permalink
Use namshi/smtp as SMTP container
Browse files Browse the repository at this point in the history
  • Loading branch information
oliv3 committed May 1, 2019
1 parent 5f62026 commit fa2dd29
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 62 deletions.
32 changes: 10 additions & 22 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,8 @@
# The inital database to be created on first launch of influxdb. Ignored
# after influxdb has been launched.
#
# TTN_DASHBOARD_MAIL_DOMAIN
# the postfix mail domain.
#
# TTN_DASHBOARD_MAIL_HOST_NAME
# the external FQDN for the mail host.
#
# TTN_DASHBOARD_MAIL_RELAY_IP
# the mail relay machine, assuming that the real mailer is upstream from us.
# The mail hostname.
#
# TTN_DASHBOARD_PORT_HTTP
# The port to listen to for HTTP. Primarily for test purposes. Defaults to
Expand Down Expand Up @@ -151,10 +145,10 @@ services:
user: "root"
volumes:
- "${TTN_DASHBOARD_DATA}node-red:/data"
# nodered opens ports on influxdb so it needs to be able to talk to it.
# nodered opens ports on influxdb and smtp so it needs to be able to talk to them.
links:
- influxdb
- postfix
- smtp

influxdb:
restart: unless-stopped
Expand Down Expand Up @@ -183,17 +177,11 @@ services:
links:
- influxdb


postfix:
smtp:
restart: unless-stopped
build:
context: ./postfix
dockerfile: Dockerfile
args:
relay_ip: "${TTN_DASHBOARD_MAIL_RELAY_IP:-}"
host_name: "${TTN_DASHBOARD_MAIL_HOST_NAME:-.}"
domain: "${TTN_DASHBOARD_MAIL_DOMAIN:-.}"

image: namshi/smtp
environment:
MAILNAME: "${TTN_DASHBOARD_MAIL_HOST_NAME:-.}"

grafana:
restart: unless-stopped
Expand All @@ -207,15 +195,15 @@ services:
GF_SERVER_ROOT_URL: "https://%(domain)s/grafana/"
GF_SMTP_ENABLED: "${TTN_DASHBOARD_GRAFANA_SMTP_ENABLED:-false}"
GF_SMTP_SKIP_VERIFY: "${TTN_DASHBOARD_GRAFANA_SMTP_SKIP_VERIFY:-false}"
GF_SMTP_HOST: "postfix:25"
GF_SMTP_HOST: "smtp:25"
GF_SMTP_FROM_ADDRESS: "${TTN_DASHBOARD_GRAFANA_SMTP_FROM_ADDRESS:-grafana@localhost}"
GF_SMTP_FROM_NAME: "${TTN_DASHBOARD_GRAFANA_PROJECT_NAME:-Default} grafana admin"
GF_LOG_MODE: "${TTN_DASHBOARD_GRAFANA_LOG_MODE:-console,file}"
GF_LOG_LEVEL: "${TTN_DASHBOARD_GRAFANA_LOG_LEVEL:-info}"
GF_INSTALL_PLUGINS: "${TTN_DASHBOARD_GRAFANA_INSTALL_PLUGINS:-}"
# grafana opens ports on influxdb and postfix, so it needs to be able to talk to it.
# grafana opens ports on influxdb and smtp, so it needs to be able to talk to them.
links:
- influxdb
- postfix
- smtp

### end of file ###
38 changes: 0 additions & 38 deletions postfix/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions postfix/postfix.sh

This file was deleted.

0 comments on commit fa2dd29

Please sign in to comment.