summaryrefslogtreecommitdiffstats
path: root/Applications/phpmyadmin/config.inc.php
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-07 10:30:43 +0100
committerstartxfr <clarue@startx.fr>2015-12-07 10:30:43 +0100
commite34ed3a382f238cf55afec6e377b7be9b21f237d (patch)
tree98dc36edbb7738206b23dffb53136f9b3c37610b /Applications/phpmyadmin/config.inc.php
parent306b73c26b19bb3e032a763a9007f5d444bddadf (diff)
downloadphpmyadmin-e34ed3a382f238cf55afec6e377b7be9b21f237d.tar.gz
phpmyadmin-e34ed3a382f238cf55afec6e377b7be9b21f237d.tar.bz2
phpmyadmin-e34ed3a382f238cf55afec6e377b7be9b21f237d.tar.xz
phpmyadmin-e34ed3a382f238cf55afec6e377b7be9b21f237d.zip
finishing application phpmyadmin and adding docker-compose-images demo file with all services used together
Diffstat (limited to 'Applications/phpmyadmin/config.inc.php')
-rw-r--r--Applications/phpmyadmin/config.inc.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index 6d46fcc..2c2f991 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -25,21 +25,21 @@ $i = 0;
/**
* First server
*/
-if(getenv('DB_ENV_MYSQL_USER') != '') {
+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('DB_ENV_MYSQL_USER');
- $cfg['Servers'][$i]['controlpass'] = getenv('DB_ENV_MYSQL_PASSWORD');
+ $cfg['Servers'][$i]['controluser'] = getenv('MARIADB_ENV_MYSQL_USER');
+ $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB_ENV_MYSQL_PASSWORD');
}
-if(getenv('DB2_ENV_MYSQL_USER') != '') {
+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('DB2_ENV_MYSQL_USER');
- $cfg['Servers'][$i]['controlpass'] = getenv('DB2_ENV_MYSQL_PASSWORD');
+ $cfg['Servers'][$i]['controluser'] = getenv('MARIADB2_ENV_MYSQL_USER');
+ $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD');
}
/**
* phpMyAdmin configuration storage settings.