diff options
-rw-r--r-- | .drone.yml | 12 | ||||
-rw-r--r-- | AppConfigBuild.php | 7 | ||||
-rw-r--r-- | app/model/Form.php | 4 |
3 files changed, 18 insertions, 5 deletions
@@ -18,10 +18,18 @@ steps: environment: + EMAIL_HOST: + from_secret: email_host + EMAIL_PORT: + from_secret: email_port + EMAIL_NAME: + from_secret: email_name EMAIL_USERNAME: from_secret: email_username EMAIL_PASSWORD: from_secret: email_password + PGSQL_DATABASE: + from_secret: pgsql_database PGSQL_USERNAME: from_secret: pgsql_username PGSQL_PASSWORD: @@ -30,8 +38,12 @@ steps: commands: - mv AppConfigBuild.php AppConfig.php + - sed -i "s|pgsql_database|$PGSQL_DATABASE|" AppConfig.php - sed -i "s|pgsql_username|$PGSQL_USERNAME|" AppConfig.php - sed -i "s|pgsql_password|$PGSQL_PASSWORD|" AppConfig.php + - sed -i "s|email_host|$EMAIL_HOST|" AppConfig.php + - sed -i "s|email_port|$EMAIL_PORT|" AppConfig.php + - sed -i "s|email_name|$EMAIL_NAME|" AppConfig.php - sed -i "s|email_username|$EMAIL_USERNAME|" AppConfig.php - sed -i "s|email_password|$EMAIL_PASSWORD|" AppConfig.php diff --git a/AppConfigBuild.php b/AppConfigBuild.php index 75188c5..0e83ebe 100644 --- a/AppConfigBuild.php +++ b/AppConfigBuild.php @@ -2,7 +2,7 @@ return [ 'database' => [ - 'name' => 'thedroneely', + 'name' => 'pgsql_database', 'username' => 'pgsql_username', 'password' => 'pgsql_password', 'connection' => 'pgsql:', @@ -12,8 +12,9 @@ return [ ], 'mail' => [ - 'host' => 'smtp.gmail.com', - 'port' => '465', + 'host' => 'email_host', + 'port' => 'email_port', + 'name' => 'email_name', 'username' => 'email_username', 'password' => 'email_password', ] diff --git a/app/model/Form.php b/app/model/Form.php index 61efb2f..e8fc1f9 100644 --- a/app/model/Form.php +++ b/app/model/Form.php @@ -51,8 +51,8 @@ class Form $mail->Password = $config['mail']['password']; //Recipients - $mail->setFrom($config['mail']['username'], 'Thedro Neely'); - $mail->addAddress($config['mail']['username'], 'Thedro Neely'); + $mail->setFrom($config['mail']['username'], $config['mail']['name']); + $mail->addAddress($config['mail']['username'], $config['mail']['name']); //Content $mail->isHTML(true); |