summaryrefslogtreecommitdiffstats
path: root/Applications/phpmyadmin/config.inc.php
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-06-28 14:26:05 +0200
committerstartxfr <clarue@startx.fr>2016-06-28 14:26:05 +0200
commit52037bf658e58777a4cca1d89260faa0e0498b19 (patch)
tree1e46dbecfb26517a1901ea6d2882c9512ceccf17 /Applications/phpmyadmin/config.inc.php
parent52817e113ed8314f82b41028bfe68fa26d0fd670 (diff)
downloadphpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.tar.gz
phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.tar.bz2
phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.tar.xz
phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.zip
change in env
Diffstat (limited to 'Applications/phpmyadmin/config.inc.php')
-rw-r--r--Applications/phpmyadmin/config.inc.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index d7411ba..110f2aa 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -35,7 +35,6 @@ if(getenv('MARIADB_ENV_MYSQL_USER') != '') {
$cfg['Servers'][$i]['password'] = getenv('MARIADB_ENV_MYSQL_PASSWORD');
}
-
if(getenv('MARIADB2_ENV_MYSQL_USER') != '') {
$i++;
$cfg['Servers'][$i]['extension'] = 'mysqli';
@@ -45,6 +44,16 @@ if(getenv('MARIADB2_ENV_MYSQL_USER') != '') {
$cfg['Servers'][$i]['user'] = getenv('MARIADB2_ENV_MYSQL_USER');
$cfg['Servers'][$i]['password'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD');
}
+
+if(getenv('DB_ENV_MYSQL_USER') != '') {
+ $i++;
+ $cfg['Servers'][$i]['extension'] = 'mysqli';
+ $cfg['Servers'][$i]['auth_type'] = 'config';
+ $cfg['Servers'][$i]['host'] = getenv('DB_PORT_3306_TCP_ADDR');
+ $cfg['Servers'][$i]['port'] = getenv('DB_PORT_3306_TCP_PORT');
+ $cfg['Servers'][$i]['user'] = getenv('DB_ENV_MYSQL_USER');
+ $cfg['Servers'][$i]['password'] = getenv('DB_ENV_MYSQL_PASSWORD');
+}
/**
* phpMyAdmin configuration storage settings.
*/