summaryrefslogtreecommitdiffstats
path: root/Applications
diff options
context:
space:
mode:
authorstartx <clarue@startx.fr>2017-08-04 22:03:18 +0200
committerGitHub <noreply@github.com>2017-08-04 22:03:18 +0200
commit54d94b19e3a3f86d9eeb2590c700e9b7eee1f432 (patch)
treeb92642ddb143e73c55c4bcbda434a4dd030c2de1 /Applications
parentfe29114db56a824aea554a7c62002d088750c682 (diff)
downloadphpmyadmin-54d94b19e3a3f86d9eeb2590c700e9b7eee1f432.tar.gz
phpmyadmin-54d94b19e3a3f86d9eeb2590c700e9b7eee1f432.tar.bz2
phpmyadmin-54d94b19e3a3f86d9eeb2590c700e9b7eee1f432.tar.xz
phpmyadmin-54d94b19e3a3f86d9eeb2590c700e9b7eee1f432.zip
Update config.inc.php
remove test
Diffstat (limited to 'Applications')
-rw-r--r--Applications/phpmyadmin/config.inc.php33
1 files changed, 15 insertions, 18 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index b629781..46d5e70 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -9,9 +9,6 @@
*
* @package PhpMyAdmin
*/
-phpinfo (INFO_ENVIRONMENT);
-var_dump($_SERVER);
-exit;
/**
* This is needed for cookie based authentication to encrypt password in
* cookie. Needs to be 32 chars long.
@@ -27,38 +24,38 @@ $i = 0;
/**
* First server
*/
-if(getenv('MARIADB_ENV_MYSQL_USER') != '') {
+if(getenv('MARIADB_SERVICE_USER') != '') {
$i++;
$cfg['Servers'][$i]['extension'] = 'mysqli';
$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');
+ $cfg['Servers'][$i]['host'] = getenv('MARIADB_SERVICE_HOST');
+ $cfg['Servers'][$i]['port'] = getenv('MARIADB_SERVICE_PORT');
+ $cfg['Servers'][$i]['user'] = getenv('MARIADB_SERVICE_USER');
+ $cfg['Servers'][$i]['password'] = getenv('MARIADB_SERVICE_PWD');
$cfg['Servers'][$i]['compress'] = false;
$cfg['Servers'][$i]['AllowNoPassword'] = false;
}
-if(getenv('MARIADB2_ENV_MYSQL_USER') != '') {
+if(getenv('MARIADB2_SERVICE_USER') != '') {
$i++;
$cfg['Servers'][$i]['extension'] = 'mysqli';
$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');
+ $cfg['Servers'][$i]['host'] = getenv('MARIADB2_SERVICE_HOST');
+ $cfg['Servers'][$i]['port'] = getenv('MARIADB2_SERVICE_PORT');
+ $cfg['Servers'][$i]['user'] = getenv('MARIADB2_SERVICE_USER');
+ $cfg['Servers'][$i]['password'] = getenv('MARIADB2_SERVICE_PWD');
$cfg['Servers'][$i]['compress'] = false;
$cfg['Servers'][$i]['AllowNoPassword'] = false;
}
-if(getenv('DB_ENV_MYSQL_USER') != '') {
+if(getenv('DB_SERVICE_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');
+ $cfg['Servers'][$i]['host'] = getenv('DB_SERVICE_HOST');
+ $cfg['Servers'][$i]['port'] = getenv('DB_SERVICE_PORT');
+ $cfg['Servers'][$i]['user'] = getenv('DB_SERVICE_USER');
+ $cfg['Servers'][$i]['password'] = getenv('DB_SERVICE_PWD');
$cfg['Servers'][$i]['compress'] = false;
$cfg['Servers'][$i]['AllowNoPassword'] = false;
}