diff --git a/apps/adminer.sh b/apps/adminer.sh index 0460fb210b..ab0c5988b1 100644 --- a/apps/adminer.sh +++ b/apps/adminer.sh @@ -52,9 +52,13 @@ a2enmod ssl # Install Adminer apt-get update -q4 & spinner_loading install_if_not adminer -curl_to_dir "http://www.adminer.org" "latest.php" "$ADMINERDIR" -curl_to_dir "https://raw.githubusercontent.com/Niyko/Hydra-Dark-Theme-for-Adminer/master" "adminer.css" "$ADMINERDIR" -ln -s "$ADMINERDIR"/latest.php "$ADMINERDIR"/adminer.php +curl_to_dir "https://download.adminerevo.org/latest/adminer" "adminer-pgsql.zip" "$ADMINERDIR" +install_if_not unzip +# Unzip the latest version +unzip "$ADMINERDIR"/adminer-pgsql.zip -d "$ADMINERDIR" +rm -f "$ADMINERDIR"/adminer-pgsql.zip +# curl_to_dir "https://raw.githubusercontent.com/Niyko/Hydra-Dark-Theme-for-Adminer/master" "adminer.css" "$ADMINERDIR" +ln -s "$ADMINERDIR"/adminer-pgsql.php "$ADMINERDIR"/adminer.php # Only add TLS 1.3 on Ubuntu later than 22.04 if version 22.04 "$DISTRO" 24.04.10 @@ -65,6 +69,46 @@ fi # Get PHP version for the conf file check_php +# shellcheck disable=2154 + +# Add ability to add plugins easily +cat << ADMINER_CREATE_PLUGIN > "$ADMINER_CONF_PLUGIN" + "$ADMINER_CONF" RewriteEngine On diff --git a/lib.sh b/lib.sh index f49fe311fa..3f7e53d90a 100644 --- a/lib.sh +++ b/lib.sh @@ -162,6 +162,7 @@ NOTIFY_PUSH_SERVICE_PATH="/etc/systemd/system/notify_push.service" # Adminer ADMINERDIR=/usr/share/adminer ADMINER_CONF="$SITES_AVAILABLE/adminer.conf" +ADMINER_CONF_PLUGIN="$ADMINERDIR/extra_plugins.php" # Redis REDIS_CONF=/etc/redis/redis.conf REDIS_SOCK=/var/run/redis/redis-server.sock