diff --git a/.gitignore b/.gitignore index 78a5e39d9b981e0b6f1639bf9d3b10d4ab55207a..7427789a1091707e9060af062a88b2c02ebd50c3 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 bac8b1b26b95da036e8dd7b5942ded983481047e..dca74e33cf3b86e361f87911747bf93854a1a728 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 e148ae621ff6b1b60953f6ed92dd7b31f126c11d..870095a1c9e6cd07ae2564e98d1d0cca6c2a1129 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 0848fb3ad2645a6f8d5fffe2b5baa785b7e0c56b..d8779bba3c5a1c3f76272672489e1e4b50df6e47 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