Add support for config auth method

Fixes #8 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Dec 14, 2015 · b0a8bc0 · b0a8bc0 · soullivaneuh · Dec 14, 2015
1 parent 7d56664
commit b0a8bc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -50,3 +50,4 @@ docker-compose up -d
 * ``PMA_ARBITRARY`` - when set to 1 connection to the arbitrary server will be allowed
 * ``PMA_HOST`` - define address/host name of the MySQL server
 * ``PMA_PORT`` - define port of the MySQL server
+* ``PMA_USER`` and ``PMA_PASSWORD`` - define username to use for config authentication method
diff --git a/config.inc.php b/config.inc.php
@@ -10,7 +10,6 @@
 /* First server */
 $i = 0;
 $i++;
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
 if (isset($_ENV['PMA_HOST'])) {
     $cfg['Servers'][$i]['host'] = $_ENV['PMA_HOST'];
 } else {
@@ -19,6 +18,13 @@
 if (isset($_ENV['PMA_PORT'])) {
     $cfg['Servers'][$i]['port'] = $_ENV['PMA_PORT'];
 }
+if (isset($_ENV['PMA_USER']) && isset($_ENV['PMA_PASSWORD']) {
+    $cfg['Servers'][$i]['auth_type'] = 'config';
+    $cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
+    $cfg['Servers'][$i]['password'] = $_ENV['PMA_PASSWORD'];
+} else {
+    $cfg['Servers'][$i]['auth_type'] = 'cookie';
+}
 $cfg['Servers'][$i]['connect_type'] = 'tcp';
 $cfg['Servers'][$i]['compress'] = false;
 $cfg['Servers'][$i]['AllowNoPassword'] = true;