From 32297eb61931e506a6f6d52462cddea8e2fcd600 Mon Sep 17 00:00:00 2001 From: larryzhu2018 <44448956+larryzhu2018@users.noreply.github.com> Date: Fri, 22 Jan 2021 02:54:32 -0800 Subject: [PATCH] support PMA_ABSOLUTE_URI (#30) * Update libphpmyadmin.sh Support reverse proxy * Update phpmyadmin-env.sh export env variable too --- .../5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh | 3 +++ .../5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh index 0741108795af..16502a16e9fb 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh @@ -72,6 +72,9 @@ phpmyadmin_initialize() { # Allow arbitrary server ! is_empty_value "$PHPMYADMIN_ALLOW_ARBITRARY_SERVER" && info "Setting AllowArbitraryServer option" && phpmyadmin_conf_set "\$cfg['AllowArbitraryServer']" "$(php_convert_to_boolean "$PHPMYADMIN_ALLOW_ARBITRARY_SERVER")" yes + # Support reverse proxy + ! is_empty_value "$PMA_ABSOLUTE_URI" && info "Setting PmaAbsoluteUri option" && phpmyadmin_conf_set "\$cfg['PmaAbsoluteUri']" "$PMA_ABSOLUTE_URI" + # Configure database settings ! is_empty_value "$DATABASE_HOST" && info "Setting database host option" && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['host']" "$DATABASE_HOST" ! is_empty_value "$DATABASE_PORT_NUMBER" && info "Setting database port number option" && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['port']" "$DATABASE_PORT_NUMBER" diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh index 37643caf7bba..a08c2c146840 100644 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh @@ -52,6 +52,7 @@ export PHPMYADMIN_DEFAULT_ALLOW_ARBITRARY_SERVER="no" # only used at build time export PHPMYADMIN_ALLOW_ARBITRARY_SERVER="${PHPMYADMIN_ALLOW_ARBITRARY_SERVER:-}" export PHPMYADMIN_DEFAULT_ALLOW_REMOTE_CONNECTIONS="yes" # only used at build time export PHPMYADMIN_ALLOW_REMOTE_CONNECTIONS="${PHPMYADMIN_ALLOW_REMOTE_CONNECTIONS:-$PHPMYADMIN_DEFAULT_ALLOW_REMOTE_CONNECTIONS}" +export PMA_ABSOLUTE_URI="${PMA_ABSOLUTE_URI:-}" # Database configuration export DATABASE_DEFAULT_HOST="mariadb" # only used at build time