From 7d566641b470b061577500dd21051bf3ee64ef23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 14 Dec 2015 13:35:40 +0100
Subject: [PATCH] Use just one configuration file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can generate correct values inside it, no need for magic handling
more of the files.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 Dockerfile                              | 2 +-
 config.inc.arbitrary.php                | 8 --------
 config.inc.linked.php => config.inc.php | 6 ++++++
 run.sh                                  | 8 --------
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 config.inc.arbitrary.php
 rename config.inc.linked.php => config.inc.php (75%)

diff --git a/Dockerfile b/Dockerfile
index 1763c47..e0ea27d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN curl --location https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-l
  && mv phpMyAdmin* /www \
  && rm -rf /www/js/jquery/src/ /www/examples /www/po/
 
-COPY config.inc.linked.php config.inc.arbitrary.php /www/
+COPY config.inc.php /www/
 COPY run.sh /run.sh
 RUN chmod u+rwx /run.sh
 
diff --git a/config.inc.arbitrary.php b/config.inc.arbitrary.php
deleted file mode 100644
index 3314152..0000000
--- a/config.inc.arbitrary.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-require('./config.secret.inc.php');
-
-$cfg['AllowArbitraryServer'] = true;
-
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
diff --git a/config.inc.linked.php b/config.inc.php
similarity index 75%
rename from config.inc.linked.php
rename to config.inc.php
index 5252c2e..a855f67 100644
--- a/config.inc.linked.php
+++ b/config.inc.php
@@ -2,6 +2,12 @@
 
 require('./config.secret.inc.php');
 
+/* Arbitrary server connection */
+if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
+    $cfg['AllowArbitraryServer'] = true;
+}
+
+/* First server */
 $i = 0;
 $i++;
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
diff --git a/run.sh b/run.sh
index df0e698..b15f3bb 100644
--- a/run.sh
+++ b/run.sh
@@ -1,14 +1,6 @@
 #!/bin/sh
 set -x
 
-# use arbitrary server
-if [ "$PMA_ARBITRARY" ]
-  then
-    cp /www/config.inc.arbitrary.php /www/config.inc.php
-  else
-    cp /www/config.inc.linked.php /www/config.inc.php
-fi
-
 if [ ! -f /www/config.secret.inc.php ] ; then
     cat > /www/config.secret.inc.php <<EOT
 <?php