Numerous bugfixes (#2772)

Author: enoch85

apps/adminer.sh

@@ -3,8 +3,10 @@
 # T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 
 true
-SCRIPT_NAME="Adminer"
-SCRIPT_EXPLAINER="Adminer is a full-featured database management tool written in PHP."
+SCRIPT_NAME="AdminNeo"
+SCRIPT_EXPLAINER="AdminNeo is a full-featured database management tool written in PHP.
+It's a continuation of Adminer development after AdminerEvo was archived.
+More info: https://www.adminneo.org"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh
 
@@ -52,13 +54,35 @@ a2enmod ssl
 # Install Adminer
 apt-get update -q4 & spinner_loading
 install_if_not adminer
-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"
-mv "$ADMINERDIR"/adminer-pgsql.php "$ADMINERDIR"/adminer.php
+
+# AdminerEvo project has been archived, switching to AdminNeo (www.adminneo.org)
+# See: https://github.com/adminneo-org/adminneo
+print_text_in_color "$ICyan" "Downloading AdminNeo version ${ADMINER_VERSION}..."
+if ! curl_to_dir "https://www.adminneo.org/files/${ADMINER_VERSION}/pgsql_en_default/" "adminneo-${ADMINER_VERSION}.php" "$ADMINERDIR"
+then
+    msg_box "Failed to download AdminNeo. The download URL may have changed.
+    
+Please report this issue to: $ISSUES
+
+Attempted to download from:
+$ADMINER_DOWNLOAD_URL"
+    exit 1
+fi
+
+# Rename to standard adminer.php name
+if [ -f "$ADMINERDIR/adminneo-${ADMINER_VERSION}.php" ]
+then
+    mv "$ADMINERDIR/adminneo-${ADMINER_VERSION}.php" "$ADMINERDIR/adminer.php"
+elif [ -f "$ADMINERDIR/adminerneo-${ADMINER_VERSION}-pgsql.php" ]
+then
+    # Fallback for old naming if somehow still exists
+    mv "$ADMINERDIR/adminerneo-${ADMINER_VERSION}-pgsql.php" "$ADMINERDIR/adminer.php"
+else
+    msg_box "Failed to find downloaded AdminNeo file. Please report this to $ISSUES"
+    exit 1
+fi
+
+print_text_in_color "$IGreen" "AdminNeo ${ADMINER_VERSION} successfully downloaded!"
 
 # Only add TLS 1.3 on Ubuntu later than 22.04
 if version 22.04 "$DISTRO" 24.04.10

apps/imaginary.sh

@@ -21,7 +21,7 @@ debug_mode
 root_check
 
 # Check recources
-# If we can calculate the cpu and ram, then set it to the lowest possible, if not, then hardcode it to a recomended minimum.
+# If we can calculate the cpu and ram, then set it to the lowest possible, if not, then hardcode it to a recommended minimum.
 if which nproc >/dev/null 2>&1
 then
     ram_check 2 Imaginary

apps/talk.sh

@@ -247,7 +247,7 @@ https://gitlab.com/packaging/nextcloud-spreed-signaling
 https://gitlab.com/packaging/janus/"
 
 # Ask the user if he/she wants the HPB server as well
-if ! yesno_box_no "Do you want to install the $SCRIPT_NAME? Please note that using basic Talk is usally enough."
+if ! yesno_box_no "Do you want to install the $SCRIPT_NAME? Please note that using basic Talk is usually enough."
 then
     exit 1
 fi

lib.sh

@@ -169,6 +169,22 @@ NOTIFY_PUSH_SERVICE_PATH="/etc/systemd/system/notify_push.service"
 ADMINERDIR=/usr/share/adminer
 ADMINER_CONF="$SITES_AVAILABLE/adminer.conf"
 ADMINER_CONF_PLUGIN="$ADMINERDIR/extra_plugins.php"
+# Get latest AdminNeo version dynamically from GitHub releases
+get_adminneo_version() {
+    local version
+    version=$(curl -s -m 30 "https://api.github.com/repos/adminneo-org/adminneo/releases/latest" | grep -oP '"tag_name":\s*"v\K[^"]+')
+    
+    # Validate version format (X.X.X)
+    if echo "$version" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'
+    then
+        echo "$version"
+    else
+        # Fallback to known stable version
+        echo "5.1.1"
+    fi
+}
+ADMINER_VERSION=$(get_adminneo_version)
+ADMINER_DOWNLOAD_URL="https://www.adminneo.org/files/${ADMINER_VERSION}/pgsql_en_default/adminneo-${ADMINER_VERSION}.php"
 # Redis
 REDIS_CONF=/etc/redis/redis.conf
 REDIS_SOCK=/var/run/redis/redis-server.sock
@@ -184,8 +200,22 @@ fulltextsearch_install() {
     ELASTIC_USER_PASSWORD=$(gen_passwd "$SHUF" '[:lower:]')
     FULLTEXTSEARCH_IMAGE_NAME=fulltextsearch_es01
     FULLTEXTSEARCH_SERVICE=nextcloud-fulltext-elasticsearch-worker.service
+    
     # Gets the version from the latest tag here: https://github.com/docker-library/official-images/blob/master/library/elasticsearch
-    FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG="$(curl -s -m 900 https://raw.githubusercontent.com/docker-library/official-images/refs/heads/master/library/elasticsearch | grep "Tags:" | head -1 | awk '{print $2}')"
+    # Use limit=500 to ensure we get version tags, not just SHA tags
+    # Extract version numbers (format: X.XX.X), sort them, and get the latest
+    FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG="$(curl -s -m 900 'https://raw.githubusercontent.com/docker-library/official-images/refs/heads/master/library/elasticsearch' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)"
+    
+    # Validate that we got a proper version number
+    if ! echo "$FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'
+    then
+        print_text_in_color "$IRed" "Failed to detect ElasticSearch version. Got: '$FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG'"
+        print_text_in_color "$ICyan" "Falling back to known stable version..."
+        FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG="8.16.1"
+    fi
+    
+    print_text_in_color "$ICyan" "ElasticSearch version detected: $FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG"
+    
     # Legacy, changed 2023-09-21
     DOCKER_IMAGE_NAME=es01
     # Legacy, not used at all

menu/documentserver.sh

@@ -17,7 +17,7 @@ debug_mode
 root_check
 
 choice=$(whiptail --title "$TITLE" --menu \
-"Which Documentserver for online editing do you want to install?\n\nWe recomend Collabora with Docker. The subdomain could look like this:\noffice.your-nextcloud.tld\n\nAutomatically configure and install the selected Documentserver.
+"Which Documentserver for online editing do you want to install?\n\nWe recommend Collabora with Docker. The subdomain could look like this:\noffice.your-nextcloud.tld\n\nAutomatically configure and install the selected Documentserver.
 $MENU_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Collabora (Docker)" "(Extra Subdomain required)" \
 "Collabora (Integrated)" "(No Subdomain required)" \

network/geoblock.sh

@@ -81,32 +81,68 @@ then
 fi
 
 ##### GeoIP script (Apache Setup)
-# Install  requirements
+# Install requirements
 yes | add-apt-repository ppa:maxmind/ppa
 apt-get update -q4 & spinner_loading
 install_if_not libmaxminddb0
 install_if_not libmaxminddb-dev
 install_if_not mmdb-bin
 install_if_not apache2-dev
 
+# Verify apxs is available after installing apache2-dev
+if ! command -v apxs2 >/dev/null 2>&1 && ! command -v apxs >/dev/null 2>&1
+then
+    msg_box "Error: apxs/apxs2 tool not found even after installing apache2-dev.
+
+This tool is required to compile the MaxMindDB Apache module.
+Please report this issue to: $ISSUES"
+    exit 1
+fi
+
 # maxminddb_module https://github.com/maxmind/mod_maxminddb
 cd /tmp
 curl_to_dir https://github.com/maxmind/mod_maxminddb/releases/download/1.2.0/ mod_maxminddb-1.2.0.tar.gz /tmp
 tar -xzf mod_maxminddb-1.2.0.tar.gz
 cd mod_maxminddb-1.2.0
+
+print_text_in_color "$ICyan" "Compiling MaxMindDB Apache module..."
 if ./configure
 then
-    make install
+    if make
+    then
+        if make install
+        then
+            print_text_in_color "$IGreen" "MaxMindDB Apache module compiled and installed successfully!"
+        else
+            msg_box "Failed to install MaxMindDB module. Please report this to $ISSUES"
+            exit 1
+        fi
+    else
+        msg_box "Failed to compile MaxMindDB module. Please report this to $ISSUES"
+        exit 1
+    fi
+    
     # Delete conf made by module
     rm -f /etc/apache2/mods-enabled/maxminddb.conf
+    
     # Check if module is enabled
     if ! apachectl -M | grep -i "maxminddb"
     then
-       msg_box "Couldn't install the Apache module for MaxMind. Please report this to $ISSUES"
+       msg_box "Couldn't load the Apache module for MaxMind after installation. Please report this to $ISSUES"
        exit 1
     fi
+    
+    print_text_in_color "$IGreen" "MaxMindDB module loaded in Apache successfully!"
+    
     # Cleanup
+    cd /tmp
     rm -rf mod_maxminddb-1.2.0 mod_maxminddb-1.2.0.tar.gz
+else
+    msg_box "Failed to configure MaxMindDB module compilation.
+    
+This usually means apxs/apxs2 is not properly installed.
+Please report this issue to: $ISSUES"
+    exit 1
 fi
 
 # Enable modules

nextcloud_install_production.sh

@@ -362,13 +362,25 @@ done
 apt-get update -q4 & spinner_loading
 install_if_not postgresql
 
-# Create DB
+# Create DB with proper permissions for Nextcloud 30+
+# PostgreSQL 15+ requires explicit schema permissions
 cd /tmp
-sudo -u postgres psql <<END
+if ! sudo -u postgres psql <<END
 CREATE USER $PGDB_USER WITH PASSWORD '$PGDB_PASS';
 CREATE DATABASE nextcloud_db WITH OWNER $PGDB_USER TEMPLATE template0 ENCODING 'UTF8';
+\c nextcloud_db
+GRANT CREATE ON SCHEMA public TO $PGDB_USER;
+GRANT ALL ON SCHEMA public TO $PGDB_USER;
+ALTER DATABASE nextcloud_db OWNER TO $PGDB_USER;
 END
+then
+    print_text_in_color "$IRed" "Failed to create PostgreSQL database with proper permissions!"
+    print_text_in_color "$ICyan" "Please report this to $ISSUES"
+    exit 1
+fi
+
 print_text_in_color "$ICyan" "PostgreSQL password: $PGDB_PASS"
+print_text_in_color "$IGreen" "PostgreSQL database created with schema permissions for Nextcloud 30+"
 systemctl restart postgresql.service
 
 # Install Apache

torrent/create.sh

@@ -7,7 +7,7 @@
 #########
 
 ## This script will install Transmission, download the latest version of the VM, create a torrent of the file and seed it using Transmission 
-## Improvments to the script are welcome!
+## Improvements to the script are welcome!
 
 # shellcheck source=lib.sh
 # shellcheck disable=SC2046