summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2018-02-17 23:51:00 +0100
committerstartxfr <clarue@startx.fr>2018-02-17 23:51:00 +0100
commitac061ade298a8cf3a50b801ed888a28d7869dea5 (patch)
treeb92642ddb143e73c55c4bcbda434a4dd030c2de1
parentce6789c80d6f948b2dd5f4c18d2729c5f8c2f6c3 (diff)
parent54d94b19e3a3f86d9eeb2590c700e9b7eee1f432 (diff)
downloadphpmyadmin-ac061ade298a8cf3a50b801ed888a28d7869dea5.tar.gz
phpmyadmin-ac061ade298a8cf3a50b801ed888a28d7869dea5.tar.bz2
phpmyadmin-ac061ade298a8cf3a50b801ed888a28d7869dea5.tar.xz
phpmyadmin-ac061ade298a8cf3a50b801ed888a28d7869dea5.zip
resolve changes
-rw-r--r--Applications/phpmyadmin/config.inc.php33
1 files changed, 17 insertions, 16 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index e332ca3..46d5e70 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -9,7 +9,6 @@
*
* @package PhpMyAdmin
*/
-
/**
* This is needed for cookie based authentication to encrypt password in
* cookie. Needs to be 32 chars long.
@@ -25,38 +24,40 @@ $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_SERVICE_HOST');
- $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]['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;
}
/**
* phpMyAdmin configuration storage settings.
@@ -177,4 +178,4 @@ $cfg['SaveDir'] = '';
/**
* You can find more configuration options in the documentation
* in the doc/ folder or at <https://docs.phpmyadmin.net/>.
- */ \ No newline at end of file
+ */