From 8cbb560f594181e1fc608a640cd99cbc0fc890a6 Mon Sep 17 00:00:00 2001 From: Hardware Date: Wed, 3 Aug 2016 21:52:59 +0200 Subject: [PATCH] fix(sql): mail settings --- config.sql | 6 +++--- startup | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.sql b/config.sql index 19a0d4e..4e6cc13 100644 --- a/config.sql +++ b/config.sql @@ -1,9 +1,9 @@ -INSERT INTO `flarum`.`settings`(`key`,`value`) VALUES +INSERT INTO `{{ DB_NAME }}`.`settings`(`key`,`value`) VALUES ('mail_host','{{ MAIL_HOST }}'), ('mail_port','{{ MAIL_PORT }}'), ('mail_username','{{ MAIL_USER }}'), ('mail_password','{{ MAIL_PASS }}'), ('mail_encryption','{{ MAIL_ENCR }}'); -UPDATE `flarum`.`settings` SET `value`='smtp' WHERE `key`='mail_driver'; -UPDATE `flarum`.`settings` SET `value`='{{ MAIL_FROM }}' WHERE `key`='mail_from'; +UPDATE `{{ DB_NAME }}`.`settings` SET `value`='smtp' WHERE `key`='mail_driver'; +UPDATE `{{ DB_NAME }}`.`settings` SET `value`='{{ MAIL_FROM }}' WHERE `key`='mail_from'; diff --git a/startup b/startup index e2aaf73..22fd3ca 100644 --- a/startup +++ b/startup @@ -49,7 +49,8 @@ chown -R flarum:flarum . if [ ! -e 'assets/rev-manifest.json' ]; then # Mail settings - sed -i -e "s|{{ MAIL_FROM }}|${MAIL_FROM}|g" \ + sed -i -e "s|{{ DB_NAME }}|${DB_NAME}|g" \ + -e "s|{{ MAIL_FROM }}|${MAIL_FROM}|g" \ -e "s|{{ MAIL_HOST }}|${MAIL_HOST}|g" \ -e "s|{{ MAIL_PORT }}|${MAIL_PORT}|g" \ -e "s|{{ MAIL_USER }}|${MAIL_USER}|g" \