Fix Phase 1 critical issues

- Fix #2738, #2769, #2724: Migrate from AdminerEvo to AdminerNeo
  * AdminerEvo project has been archived
  * Updated to use AdminerNeo v1.0.2 from GitHub releases
  * Added proper error handling and file validation

- Fix #2731, #2697: ElasticSearch version detection
  * Improved regex to extract version numbers from any position
  * Added validation to ensure proper version format
  * Added fallback to known stable version (8.16.1) if detection fails

- Fix #2761, #2727: PostgreSQL schema permissions for NC 30+
  * Added GRANT CREATE ON SCHEMA public for fresh installations
  * Added migration fix in update script for existing installations
  * PostgreSQL 15+ requires explicit schema permissions

- Fix #2701, #2674: GeoBlock installation improvements
  * Better error handling for apache2-dev dependency conflicts
  * Added dependency fix attempts before failing
  * Improved compilation error messages
  * Added verification that apxs tool is available
  * Better progress feedback during compilation

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="AdminerNeo"
+SCRIPT_EXPLAINER="AdminerNeo is a full-featured database management tool written in PHP.
+It's a fork of Adminer, continuing development after AdminerEvo was archived.
+More info: https://github.com/adminerneo/adminerneo"
 # shellcheck source=lib.sh
 source /var/scripts/fetch_lib.sh
 
@@ -52,13 +54,51 @@ 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"
+
+# AdminerEvo project has been archived, switching to AdminerNeo
+# See: https://github.com/adminerneo/adminerneo
+ADMINER_VERSION="1.0.2"
+ADMINER_DOWNLOAD_URL="https://github.com/adminerneo/adminerneo/releases/download/v${ADMINER_VERSION}/adminerneo-${ADMINER_VERSION}-pgsql.zip"
+
+print_text_in_color "$ICyan" "Downloading AdminerNeo version ${ADMINER_VERSION}..."
+if ! curl_to_dir "https://github.com/adminerneo/adminerneo/releases/download/v${ADMINER_VERSION}/" "adminerneo-${ADMINER_VERSION}-pgsql.zip" "$ADMINERDIR"
+then
+    msg_box "Failed to download AdminerNeo. The download URL may have changed.
+    
+Please report this issue to: $ISSUES
+
+Attempted to download from:
+$ADMINER_DOWNLOAD_URL"
+    exit 1
+fi
+
 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
+if ! unzip -o "$ADMINERDIR"/adminerneo-${ADMINER_VERSION}-pgsql.zip -d "$ADMINERDIR"
+then
+    msg_box "Failed to extract AdminerNeo archive. Please report this to $ISSUES"
+    exit 1
+fi
+
+rm -f "$ADMINERDIR"/adminerneo-${ADMINER_VERSION}-pgsql.zip
+
+# AdminerNeo uses different naming convention
+if [ -f "$ADMINERDIR"/adminerneo-${ADMINER_VERSION}-pgsql.php ]; then
+    mv "$ADMINERDIR"/adminerneo-${ADMINER_VERSION}-pgsql.php "$ADMINERDIR"/adminer.php
+elif [ -f "$ADMINERDIR"/adminerneo-pgsql.php ]; then
+    mv "$ADMINERDIR"/adminerneo-pgsql.php "$ADMINERDIR"/adminer.php
+else
+    # Fallback: find any .php file and use it
+    ADMINER_PHP_FILE=$(find "$ADMINERDIR" -maxdepth 1 -name "*.php" -type f | head -1)
+    if [ -n "$ADMINER_PHP_FILE" ]; then
+        mv "$ADMINER_PHP_FILE" "$ADMINERDIR"/adminer.php
+    else
+        msg_box "Could not find AdminerNeo PHP file after extraction. Please report this to $ISSUES"
+        exit 1
+    fi
+fi
+
+print_text_in_color "$IGreen" "AdminerNeo ${ADMINER_VERSION} successfully downloaded and extracted!"
 
 # Only add TLS 1.3 on Ubuntu later than 22.04
 if version 22.04 "$DISTRO" 24.04.10

lib.sh

@@ -184,8 +184,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

network/geoblock.sh

@@ -81,32 +81,103 @@ 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
+
+# Install apache2-dev with dependency resolution
+# Handle conflicts with Sury PPA packages
+print_text_in_color "$ICyan" "Installing apache2-dev (this may take a moment)..."
+if ! apt-get install -y apache2-dev 2>&1 | tee /tmp/apache2-dev-install.log
+then
+    print_text_in_color "$IYellow" "Warning: apache2-dev installation encountered issues."
+    print_text_in_color "$ICyan" "Attempting to resolve dependency conflicts..."
+    
+    # Try to fix broken dependencies
+    if apt-get install -f -y
+    then
+        print_text_in_color "$IGreen" "Dependencies fixed, retrying apache2-dev installation..."
+        if ! apt-get install -y apache2-dev
+        then
+            msg_box "Failed to install apache2-dev even after fixing dependencies.
+
+This is likely due to conflicts with PHP PPA packages (e.g., Sury PPA).
+The error log has been saved to /tmp/apache2-dev-install.log
+
+Please report this issue to: $ISSUES
+Include the contents of /tmp/apache2-dev-install.log"
+            exit 1
+        fi
+    else
+        msg_box "Could not resolve apache2-dev dependency conflicts.
+
+The error log has been saved to /tmp/apache2-dev-install.log
+
+Please report this issue to: $ISSUES
+Include the contents of /tmp/apache2-dev-install.log"
+        exit 1
+    fi
+fi
+
+# Verify apxs is available before attempting compilation
+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
+
+print_text_in_color "$IGreen" "apache2-dev and apxs successfully installed!"
 
 # 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,26 @@ 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
 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
+
+if [ $? -ne 0 ]; 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

nextcloud_update.sh

@@ -84,6 +84,34 @@ then
     fi
 fi
 
+# Fix PostgreSQL schema permissions for Nextcloud 30+ (if PostgreSQL is installed)
+# PostgreSQL 15+ requires explicit schema permissions that weren't needed before
+if is_this_installed postgresql-common
+then
+    # Get database info
+    ncdb
+    
+    # Check if we need to apply the fix (test if user can create tables)
+    if sudo -u postgres psql -d "$NCDB" -c "SELECT has_schema_privilege('$NCUSER', 'public', 'CREATE');" 2>/dev/null | grep -q "f"
+    then
+        print_text_in_color "$ICyan" "Applying PostgreSQL schema permission fix for Nextcloud 30+..."
+        
+        # Apply the fix
+        if sudo -u postgres psql -d "$NCDB" <<END
+GRANT CREATE ON SCHEMA public TO $NCUSER;
+GRANT ALL ON SCHEMA public TO $NCUSER;
+END
+        then
+            print_text_in_color "$IGreen" "PostgreSQL schema permissions updated successfully!"
+        else
+            print_text_in_color "$IYellow" "Warning: Could not update PostgreSQL schema permissions."
+            print_text_in_color "$IYellow" "This may cause issues with Nextcloud 30+ upgrades."
+            print_text_in_color "$ICyan" "You can try to fix this manually by running:"
+            print_text_in_color "$ICyan" "sudo -u postgres psql -d $NCDB -c 'GRANT CREATE ON SCHEMA public TO $NCUSER;'"
+        fi
+    fi
+fi
+
 # Set product name
 if home_sme_server
 then