From 2cdcd13e68d882ff8d68c0b201f820c16ecf7201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 17 Apr 2018 18:37:59 +0200 Subject: [PATCH 1/4] [TASK] Config: Add MySQL environment variables --- htconfig.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/htconfig.php b/htconfig.php index f4ea4d295..c078103e8 100644 --- a/htconfig.php +++ b/htconfig.php @@ -21,6 +21,15 @@ $db_user = 'mysqlusername'; $db_pass = 'mysqlpassword'; $db_data = 'mysqldatabasename'; +// Set this variable to true if you want to use environment variables for mysql +$db_use_env_vars = false; +if ($db_use_env_vars) { + $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); + $db_user = getenv('MYSQL_USERNAME'); + $db_pass = getenv('MYSQL_PASSWORD'); + $db_data = getenv('MYSQL_DATABASE'); +} + // Set the database connection charset to full Unicode (utf8mb4). // Changing this value will likely corrupt the special characters. // You have been warned. From fc8b11283a31f91737a5fe4baab051ddb889ad6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 17 Apr 2018 18:40:24 +0200 Subject: [PATCH 2/4] [TASK] Template: Environment variables for MySQL --- view/templates/htconfig.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index f651a273f..0b81b7732 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -17,6 +17,15 @@ $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +// Set this variable to true, if you want to use environment variables for mysql +$db_use_env_vars = false; +if ($db_use_env_vars === true) { + $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); + $db_user = getenv('MYSQL_USERNAME'); + $db_pass = getenv('MYSQL_PASSWORD'); + $db_data = getenv('MYSQL_DATABASE'); +} + // Set the database connection charset to full Unicode (utf8mb4). // Changing this value will likely corrupt the special characters. // You have been warned. From 19cddd2bc830477a8f5da4ade93c4a97cef6b0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= <25648755+M-arcus@users.noreply.github.com> Date: Fri, 20 Apr 2018 18:21:00 +0200 Subject: [PATCH 3/4] [TASK] Config: Add check for environment values --- htconfig.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htconfig.php b/htconfig.php index c078103e8..beec41c9c 100644 --- a/htconfig.php +++ b/htconfig.php @@ -21,9 +21,12 @@ $db_user = 'mysqlusername'; $db_pass = 'mysqlpassword'; $db_data = 'mysqldatabasename'; -// Set this variable to true if you want to use environment variables for mysql -$db_use_env_vars = false; -if ($db_use_env_vars) { +// Use environment variables for mysql if they are set beforehand +if (!empty(getenv('MYSQL_HOST')) + && !empty(getenv('MYSQL_PORT')) + && !empty(getenv('MYSQL_USERNAME')) + && !empty(getenv('MYSQL_PASSWORD')) + && !empty(getenv('MYSQL_DATABASE'))) { $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); $db_user = getenv('MYSQL_USERNAME'); $db_pass = getenv('MYSQL_PASSWORD'); From 26ba5edda73b861a9fab7d7d0c57d4f1f7109887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= <25648755+M-arcus@users.noreply.github.com> Date: Fri, 20 Apr 2018 18:24:28 +0200 Subject: [PATCH 4/4] [TASK] Template: Add check for environment values --- view/templates/htconfig.tpl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 0b81b7732..d72307fb5 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -17,9 +17,12 @@ $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; -// Set this variable to true, if you want to use environment variables for mysql -$db_use_env_vars = false; -if ($db_use_env_vars === true) { +// Use environment variables for mysql if they are set beforehand +if (!empty(getenv('MYSQL_HOST')) + && !empty(getenv('MYSQL_PORT')) + && !empty(getenv('MYSQL_USERNAME')) + && !empty(getenv('MYSQL_PASSWORD')) + && !empty(getenv('MYSQL_DATABASE'))) { $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); $db_user = getenv('MYSQL_USERNAME'); $db_pass = getenv('MYSQL_PASSWORD');