From 1b840f43b4c8fa7b77e18366067b583195cc6a71 Mon Sep 17 00:00:00 2001
From: Timothee Gosselin <timothee@indie.host>
Date: Sat, 1 Dec 2018 01:18:04 +0100
Subject: [PATCH] fix env

---
 scripts/install | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4e722b7..53983d2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -3,18 +3,13 @@
 MYSQL_ROOT_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
 NEXTCLOUD_ADMIN_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
 
-var=$(for folder in `ls /data/domains`; do cat /data/domains/$folder/.env | grep SUBNET | cut -d"=" -f2; done | sort | tail -n1)
-SUBNET=$(($var +1))
-
-echo "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" > .env
-echo "MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}" >> .env
 echo "SUBNET=${SUBNET}" >> .env
 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=noreply.${URL}" >> .env
+echo "SMTP_HOST=${MAIL_HOST}" >> .env
+echo "SMTP_PORT=${MAIL_PORT}" >> .env
+echo "SMTP_PASSWORD=${MAIL_PASS}" >> .env
+echo "MAIL_FROM_ADDRESS=${MAIL_USER}" >> .env
 echo "SMTP_NAME=${MAIL_USER}" >> .env
 echo "NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}" >> .env
 echo "NEXTCLOUD_VERSION=14.0.4-fpm" >> .env
-- 
GitLab