diff options
| author | startxfr <clarue@startx.fr> | 2016-06-28 14:26:05 +0200 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2016-06-28 14:26:05 +0200 |
| commit | 52037bf658e58777a4cca1d89260faa0e0498b19 (patch) | |
| tree | 1e46dbecfb26517a1901ea6d2882c9512ceccf17 | |
| parent | 52817e113ed8314f82b41028bfe68fa26d0fd670 (diff) | |
| download | phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.tar.gz phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.tar.bz2 phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.tar.xz phpmyadmin-52037bf658e58777a4cca1d89260faa0e0498b19.zip | |
change in env
| -rw-r--r-- | Applications/phpmyadmin/config.inc.php | 11 | ||||
| -rw-r--r-- | Services/apache/sx-httpd.sh | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php index d7411ba..110f2aa 100644 --- a/Applications/phpmyadmin/config.inc.php +++ b/Applications/phpmyadmin/config.inc.php @@ -35,7 +35,6 @@ if(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'; @@ -45,6 +44,16 @@ if(getenv('MARIADB2_ENV_MYSQL_USER') != '') { $cfg['Servers'][$i]['user'] = getenv('MARIADB2_ENV_MYSQL_USER'); $cfg['Servers'][$i]['password'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD'); } + +if(getenv('DB_ENV_MYSQL_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'); +} /** * phpMyAdmin configuration storage settings. */ diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh index b404dd6..6937969 100644 --- a/Services/apache/sx-httpd.sh +++ b/Services/apache/sx-httpd.sh @@ -89,6 +89,7 @@ function setEnvironmentVariableInFile { function setSys2HttpEnvironmentVariable { + echo "adding environement to $1" | tee -a $STARTUPLOG echo "" >> $1 for _curVar in `env | awk -F = '{print $1}'`;do setEnvironmentVariableInFile $1 ${_curVar} ${!_curVar} |