summaryrefslogtreecommitdiffstats
path: root/Applications
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-06-11 18:57:46 +0200
committerstartxfr <clarue@startx.fr>2016-06-11 18:57:46 +0200
commit944ab10bbc0bf47ab5b5a6571b07920d6f86dc18 (patch)
tree32b09284f3c0043040f1bf52b805bce76c8a3e9d /Applications
parent54f76c8ff6b31b331e2ef261a00e277e745587b1 (diff)
downloadphpmyadmin-944ab10bbc0bf47ab5b5a6571b07920d6f86dc18.tar.gz
phpmyadmin-944ab10bbc0bf47ab5b5a6571b07920d6f86dc18.tar.bz2
phpmyadmin-944ab10bbc0bf47ab5b5a6571b07920d6f86dc18.tar.xz
phpmyadmin-944ab10bbc0bf47ab5b5a6571b07920d6f86dc18.zip
change for config pma
Diffstat (limited to 'Applications')
-rw-r--r--Applications/phpmyadmin/config.inc.php19
1 files 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.