Skip to content

Commit 88b594a

Browse files
enable server specific ssl
Signed-off-by: TasdidurRahman <tasdid@appscode.com>
1 parent 2d6be82 commit 88b594a

7 files changed

Lines changed: 29 additions & 2 deletions

File tree

apache/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ get_docker_secret MYSQL_ROOT_PASSWORD
5555
get_docker_secret MYSQL_PASSWORD
5656
get_docker_secret PMA_HOSTS
5757
get_docker_secret PMA_HOST
58-
get_docker_secret PMA_SSL
59-
get_docker_secret PMA_SSLS
6058
get_docker_secret PMA_CONTROLHOST
6159
get_docker_secret PMA_CONTROLUSER
6260
get_docker_secret PMA_CONTROLPASS
61+
get_docker_secret PMA_SSL
62+
get_docker_secret PMA_SSLS
6363

6464
exec "$@"

config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
'MEMORY_LIMIT',
2828
'PMA_UPLOADDIR',
2929
'PMA_SAVEDIR',
30+
'PMA_SSL',
31+
'PMA_SSLS',
3032
];
3133

3234
foreach ($vars as $var) {
@@ -63,10 +65,12 @@
6365
$hosts = [$_ENV['PMA_HOST']];
6466
$verbose = [$_ENV['PMA_VERBOSE']];
6567
$ports = [$_ENV['PMA_PORT']];
68+
$ssls = [$_ENV['PMA_SSL']];
6669
} elseif (! empty($_ENV['PMA_HOSTS'])) {
6770
$hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
6871
$verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
6972
$ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
73+
$ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
7074
}
7175

7276
if (! empty($_ENV['PMA_SOCKET'])) {
@@ -77,6 +81,9 @@
7781

7882
/* Server settings */
7983
for ($i = 1; isset($hosts[$i - 1]); $i++) {
84+
if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
85+
$cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
86+
}
8087
$cfg['Servers'][$i]['host'] = $hosts[$i - 1];
8188
if (isset($verbose[$i - 1])) {
8289
$cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];

docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,7 @@ get_docker_secret PMA_HOST
5858
get_docker_secret PMA_CONTROLHOST
5959
get_docker_secret PMA_CONTROLUSER
6060
get_docker_secret PMA_CONTROLPASS
61+
get_docker_secret PMA_SSL
62+
get_docker_secret PMA_SSLS
6163

6264
exec "$@"

fpm-alpine/config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
'MEMORY_LIMIT',
2828
'PMA_UPLOADDIR',
2929
'PMA_SAVEDIR',
30+
'PMA_SSL',
31+
'PMA_SSLS',
3032
];
3133

3234
foreach ($vars as $var) {
@@ -63,10 +65,12 @@
6365
$hosts = [$_ENV['PMA_HOST']];
6466
$verbose = [$_ENV['PMA_VERBOSE']];
6567
$ports = [$_ENV['PMA_PORT']];
68+
$ssls = [$_ENV['PMA_SSL']];
6669
} elseif (! empty($_ENV['PMA_HOSTS'])) {
6770
$hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
6871
$verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
6972
$ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
73+
$ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
7074
}
7175

7276
if (! empty($_ENV['PMA_SOCKET'])) {
@@ -77,6 +81,9 @@
7781

7882
/* Server settings */
7983
for ($i = 1; isset($hosts[$i - 1]); $i++) {
84+
if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
85+
$cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
86+
}
8087
$cfg['Servers'][$i]['host'] = $hosts[$i - 1];
8188
if (isset($verbose[$i - 1])) {
8289
$cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];

fpm-alpine/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,7 @@ get_docker_secret PMA_HOST
5050
get_docker_secret PMA_CONTROLHOST
5151
get_docker_secret PMA_CONTROLUSER
5252
get_docker_secret PMA_CONTROLPASS
53+
get_docker_secret PMA_SSL
54+
get_docker_secret PMA_SSLS
5355

5456
exec "$@"

fpm/config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
'MEMORY_LIMIT',
2828
'PMA_UPLOADDIR',
2929
'PMA_SAVEDIR',
30+
'PMA_SSL',
31+
'PMA_SSLS',
3032
];
3133

3234
foreach ($vars as $var) {
@@ -63,10 +65,12 @@
6365
$hosts = [$_ENV['PMA_HOST']];
6466
$verbose = [$_ENV['PMA_VERBOSE']];
6567
$ports = [$_ENV['PMA_PORT']];
68+
$ssls = [$_ENV['PMA_SSL']];
6669
} elseif (! empty($_ENV['PMA_HOSTS'])) {
6770
$hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
6871
$verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
6972
$ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
73+
$ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
7074
}
7175

7276
if (! empty($_ENV['PMA_SOCKET'])) {
@@ -77,6 +81,9 @@
7781

7882
/* Server settings */
7983
for ($i = 1; isset($hosts[$i - 1]); $i++) {
84+
if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
85+
$cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
86+
}
8087
$cfg['Servers'][$i]['host'] = $hosts[$i - 1];
8188
if (isset($verbose[$i - 1])) {
8289
$cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];

fpm/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,7 @@ get_docker_secret PMA_HOST
5050
get_docker_secret PMA_CONTROLHOST
5151
get_docker_secret PMA_CONTROLUSER
5252
get_docker_secret PMA_CONTROLPASS
53+
get_docker_secret PMA_SSL
54+
get_docker_secret PMA_SSLS
5355

5456
exec "$@"

0 commit comments

Comments
 (0)