From b68f3ac51359ea9e6335ddfab6b883d93b75ac8c Mon Sep 17 00:00:00 2001
From: unteem <timothee@unteem.org>
Date: Wed, 10 Jan 2018 17:58:43 +0100
Subject: [PATCH] mail config with env var
---
.gitignore | 3 ++-
docker-compose.yml | 7 +++++++
env-sample | 8 ++++++++
scripts/install | 23 +++++++----------------
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 78a5e39..7427789 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
.env
data
-mysql
\ No newline at end of file
+mysql
+mail.config.php
diff --git a/docker-compose.yml b/docker-compose.yml
index bac8b1b..dca74e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,13 @@ services:
- ./data/config:/var/www/html/config
- ./data/data:/var/www/html/data
environment:
+ - MAIL_HOST
+ - MAIL_FROM
+ - MAIL_PASS
+ - MAIL_PORT
+ - URL
+ - MAIL_DOMAIN
+ - SMTP_NAME
- MYSQL_DATABASE=nextcloud
- MYSQL_HOST=db
- MYSQL_USER=root
diff --git a/env-sample b/env-sample
index e148ae6..870095a 100644
--- a/env-sample
+++ b/env-sample
@@ -2,3 +2,11 @@ MYSQL_ROOT_PASSWORD=
MYSQL_PASSWORD=
SUBNET=
+MAIL_DOMAIN=
+URL=
+MAIL_HOST=
+MAIL_PORT=
+MAIL_PASS=
+MAIL_FROM=
+SMTP_NAME=
+
diff --git a/scripts/install b/scripts/install
index 0848fb3..d8779bb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -8,21 +8,12 @@ SUBNET=$(($var +1))
echo "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" > .env
echo "MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}" >> .env
echo "SUBNET=${SUBNET}" >> .env
-
-cat > mail.config.php <<EOF
-<?php
-\$CONFIG = array (
- 'mail_domain' => '${MAIL_DOMAIN}',
- 'mail_from_address' => 'noreply.${URL}',
- 'mail_smtpmode' => 'smtp',
- 'mail_smtphost' => '${MAIL_HOST}',
- 'mail_smtpport' => '${MAIL_PORT}',
- 'mail_smtpauth' => 1,
- 'mail_smtpauthtype' => 'LOGIN',
- 'mail_smtpname' => 'noreply.${URL}@${MAIL_DOMAIN}',
- 'mail_smtppassword' => '${MAIL_PASS}',
- 'mail_smtpsecure' => 'tls',
-);
-EOF
+echo "MAIL_DOMAIN=${MAIL_DOMAIN}" >> .env
+echo "URL=${URL}" >> .env
+echo "MAIL_HOST=${MAIL_HOST}" >> .env
+echo "MAIL_PORT=${MAIL_PORT}" >> .env
+echo "MAIL_PASS=${MAIL_PASS}" >> .env
+echo "MAIL_FROM=${MAIL_USER}" >> .env
+echo "SMTP_NAME=${MAIL_USER}@${MAIL_DOMAIN}" >> .env
--
GitLab