diff options
| author | startxfr <clarue@startx.fr> | 2015-12-07 03:05:46 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-12-07 03:05:46 +0100 |
| commit | 306b73c26b19bb3e032a763a9007f5d444bddadf (patch) | |
| tree | 7d8ffd3ec93d1ef5527a0e1d2c3fc41bdea3a5af /Applications/phpmyadmin/config.inc.php | |
| parent | 15d8c51d28fa2245886b732df5373eedb2dde0cf (diff) | |
| download | phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.tar.gz phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.tar.bz2 phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.tar.xz phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.zip | |
finish phpmyadmin for latest flavour
Diffstat (limited to 'Applications/phpmyadmin/config.inc.php')
| -rw-r--r-- | Applications/phpmyadmin/config.inc.php | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php index 5c73c2e..6d46fcc 100644 --- a/Applications/phpmyadmin/config.inc.php +++ b/Applications/phpmyadmin/config.inc.php @@ -1,4 +1,5 @@ <?php + /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpMyAdmin sample configuration, you can use it as base for @@ -9,12 +10,12 @@ * * @package PhpMyAdmin */ - /** * This is needed for cookie based authentication to encrypt password in * cookie */ -$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$cfg['blowfish_secret'] = 'SECRET'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$cfg['PmaNoRelation_DisableWarning'] = true; /** * Servers configuration @@ -24,19 +25,25 @@ $i = 0; /** * First server */ -$i++; -/* Authentication type */ -$cfg['Servers'][$i]['auth_type'] = 'cookie'; -/* Server parameters */ -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -$cfg['Servers'][$i]['AllowNoPassword'] = false; - +if(getenv('DB_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'); +} +if(getenv('DB2_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'); +} /** * phpMyAdmin configuration storage settings. */ - /* User used to manipulate with storage */ // $cfg['Servers'][$i]['controlhost'] = ''; // $cfg['Servers'][$i]['controlport'] = ''; @@ -70,7 +77,6 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; /** * End of servers configuration */ - /** * Directories for saving/loading files from server */ |