From 944ab10bbc0bf47ab5b5a6571b07920d6f86dc18 Mon Sep 17 00:00:00 2001 From: startxfr Date: Sat, 11 Jun 2016 18:57:46 +0200 Subject: change for config pma --- Applications/phpmyadmin/config.inc.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php index 2c2f991..5c16602 100644 --- a/Applications/phpmyadmin/config.inc.php +++ b/Applications/phpmyadmin/config.inc.php @@ -28,18 +28,21 @@ $i = 0; if(getenv('MARIADB_ENV_MYSQL_USER') != '') { $i++; $cfg['Servers'][$i]['extension'] = 'mysqli'; - $cfg['Servers'][$i]['host'] = 'db'; - $cfg['Servers'][$i]['controlhost'] = ''; - $cfg['Servers'][$i]['controluser'] = getenv('MARIADB_ENV_MYSQL_USER'); - $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB_ENV_MYSQL_PASSWORD'); + $cfg['Servers'][$i]['auth_type'] = 'config'; + $cfg['Servers'][$i]['host'] = getenv('MARIADB_PORT_3306_TCP_ADDR'); + $cfg['Servers'][$i]['port'] = getenv('MARIADB_PORT_3306_TCP_PORT'); + $cfg['Servers'][$i]['user'] = 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'; - $cfg['Servers'][$i]['host'] = 'db2'; - $cfg['Servers'][$i]['controlhost'] = ''; - $cfg['Servers'][$i]['controluser'] = getenv('MARIADB2_ENV_MYSQL_USER'); - $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD'); + $cfg['Servers'][$i]['auth_type'] = 'config'; + $cfg['Servers'][$i]['host'] = getenv('MARIADB2_PORT_3306_TCP_ADDR'); + $cfg['Servers'][$i]['port'] = getenv('MARIADB2_PORT_3306_TCP_PORT'); + $cfg['Servers'][$i]['user'] = getenv('MARIADB2_ENV_MYSQL_USER'); + $cfg['Servers'][$i]['password'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD'); } /** * phpMyAdmin configuration storage settings. -- cgit v1.2.1