enable server specific ssl

Signed-off-by: TasdidurRahman <[email protected]>
phpmyadmin · Aug 19, 2024 · 88b594a · 88b594a
1 parent 2d6be82
commit 88b594a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 2 deletions.
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
@@ -55,10 +55,10 @@ get_docker_secret MYSQL_ROOT_PASSWORD
 get_docker_secret MYSQL_PASSWORD
 get_docker_secret PMA_HOSTS
 get_docker_secret PMA_HOST
-get_docker_secret PMA_SSL
-get_docker_secret PMA_SSLS
 get_docker_secret PMA_CONTROLHOST
 get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
+get_docker_secret PMA_SSL
+get_docker_secret PMA_SSLS
 
 exec "$@"
diff --git a/config.inc.php b/config.inc.php
@@ -27,6 +27,8 @@
  'MEMORY_LIMIT',
  'PMA_UPLOADDIR',
  'PMA_SAVEDIR',
+ 'PMA_SSL',
+ 'PMA_SSLS',
 ];
 
 foreach ($vars as $var) {
@@ -63,10 +65,12 @@
  $hosts = [$_ENV['PMA_HOST']];
  $verbose = [$_ENV['PMA_VERBOSE']];
  $ports = [$_ENV['PMA_PORT']];
+ $ssls = [$_ENV['PMA_SSL']];
 } elseif (! empty($_ENV['PMA_HOSTS'])) {
  $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
  $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
  $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
+ $ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
 }
 
 if (! empty($_ENV['PMA_SOCKET'])) {
@@ -77,6 +81,9 @@
 
 /* Server settings */
 for ($i = 1; isset($hosts[$i - 1]); $i++) {
+ if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
+ $cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
+ }
  $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
  if (isset($verbose[$i - 1])) {
  $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -58,5 +58,7 @@ get_docker_secret PMA_HOST
 get_docker_secret PMA_CONTROLHOST
 get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
+get_docker_secret PMA_SSL
+get_docker_secret PMA_SSLS
 
 exec "$@"
diff --git a/fpm-alpine/config.inc.php b/fpm-alpine/config.inc.php
@@ -27,6 +27,8 @@
  'MEMORY_LIMIT',
  'PMA_UPLOADDIR',
  'PMA_SAVEDIR',
+ 'PMA_SSL',
+ 'PMA_SSLS',
 ];
 
 foreach ($vars as $var) {
@@ -63,10 +65,12 @@
  $hosts = [$_ENV['PMA_HOST']];
  $verbose = [$_ENV['PMA_VERBOSE']];
  $ports = [$_ENV['PMA_PORT']];
+ $ssls = [$_ENV['PMA_SSL']];
 } elseif (! empty($_ENV['PMA_HOSTS'])) {
  $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
  $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
  $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
+ $ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
 }
 
 if (! empty($_ENV['PMA_SOCKET'])) {
@@ -77,6 +81,9 @@
 
 /* Server settings */
 for ($i = 1; isset($hosts[$i - 1]); $i++) {
+ if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
+ $cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
+ }
  $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
  if (isset($verbose[$i - 1])) {
  $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];

diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
@@ -50,5 +50,7 @@ get_docker_secret PMA_HOST
 get_docker_secret PMA_CONTROLHOST
 get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
+get_docker_secret PMA_SSL
+get_docker_secret PMA_SSLS
 
 exec "$@"
diff --git a/fpm/config.inc.php b/fpm/config.inc.php
@@ -27,6 +27,8 @@
  'MEMORY_LIMIT',
  'PMA_UPLOADDIR',
  'PMA_SAVEDIR',
+ 'PMA_SSL',
+ 'PMA_SSLS',
 ];
 
 foreach ($vars as $var) {
@@ -63,10 +65,12 @@
  $hosts = [$_ENV['PMA_HOST']];
  $verbose = [$_ENV['PMA_VERBOSE']];
  $ports = [$_ENV['PMA_PORT']];
+ $ssls = [$_ENV['PMA_SSL']];
 } elseif (! empty($_ENV['PMA_HOSTS'])) {
  $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
  $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
  $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
+ $ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
 }
 
 if (! empty($_ENV['PMA_SOCKET'])) {
@@ -77,6 +81,9 @@
 
 /* Server settings */
 for ($i = 1; isset($hosts[$i - 1]); $i++) {
+ if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
+ $cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
+ }
  $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
  if (isset($verbose[$i - 1])) {
  $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
@@ -50,5 +50,7 @@ get_docker_secret PMA_HOST
 get_docker_secret PMA_CONTROLHOST
 get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
+get_docker_secret PMA_SSL
+get_docker_secret PMA_SSLS
 
 exec "$@"