AppConfigBuild.php: Move hardcoded metadata to environment variables

3 files changed, 18 insertions, 5 deletions

diff --git a/.drone.yml b/.drone.yml
index f1bff35..3d0a0c6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,6 +18,12 @@ 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:
@@ -28,6 +34,8 @@ steps:
       from_secret: hashover_admin
     HASHOVER_PASSWORD:
       from_secret: hashover_password
+    PGSQL_DATABASE:
+      from_secret: pgsql_database
     PGSQL_USERNAME:
       from_secret: pgsql_username
     PGSQL_PASSWORD:
@@ -40,8 +48,12 @@ steps:
   - sed -i "s|hashover_admin|$HASHOVER_ADMIN|" bootstrap/comments/backend/classes/secrets.php
   - sed -i "s|hashover_password|$HASHOVER_PASSWORD|" bootstrap/comments/backend/classes/secrets.php
   - 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 3e690b5..0e83ebe 100644
--- a/AppConfigBuild.php
+++ b/AppConfigBuild.php
@@ -2,7 +2,7 @@
 
 return [
     'database' => [
-        'name' => 'edwinmattiacci',
+        'name' => 'pgsql_database',
         'username' => 'pgsql_username',
         'password' => 'pgsql_password',
         'connection' => 'pgsql:',
@@ -12,8 +12,9 @@ return [
     ],
 
     'mail' => [
-        'host' => 'smtp.mail.yahoo.com',
-        'port' => '465',
+        'host' => 'email_host',
+        'port' => 'email_port',
+        'name' => 'email_name',
         'username' => 'email_username',
         'password' => 'email_password',
     ]
diff --git a/bootstrap/Functions.php b/bootstrap/Functions.php
index cf2f6a2..47008c3 100644
--- a/bootstrap/Functions.php
+++ b/bootstrap/Functions.php
@@ -22,8 +22,8 @@ function sendMail($name, $email, $message)
         $mail->Password = $config['mail']['password'];
 
         //Recipients
-        $mail->setFrom($config['mail']['username'], 'Edwin Mattiacci');
-        $mail->addAddress($config['mail']['username'], 'Edwin Mattiacci');
+        $mail->setFrom($config['mail']['username'], $config['mail']['name']);
+        $mail->addAddress($config['mail']['username'], $config['mail']['name']);
 
         //Content
         $mail->isHTML(true);