Ensure plugin installation works on Cloudron

start.sh

@@ -56,21 +56,34 @@ setup_password() {
 
 # Set up Java environment
 setup_java() {
-    if [ -L /app/data/jdk/bin/java ]; then
+    mkdir -p /app/data/jdk/bin
+    
+    if [ -x /app/data/jdk/bin/java ]; then
+        echo "Java already configured: $(/app/data/jdk/bin/java -version 2>&1 | head -n 1)"
         return 0
     fi
     
     echo "Setting up Java environment..."
     
-    # Try Java 17 first, then fall back to system Java
-    if [ -f /usr/lib/jvm/java-17-openjdk-amd64/bin/java ]; then
-        ln -sf /usr/lib/jvm/java-17-openjdk-amd64/bin/{java,javac,javadoc,jar} /app/data/jdk/bin/
-    else
-        JAVA_PATH=$(which java)
-        if [ -n "$JAVA_PATH" ]; then
-            ln -sf $JAVA_PATH /app/data/jdk/bin/java
+    JAVA_FOUND=0
+    for candidate in /usr/lib/jvm/java-21-openjdk-amd64/bin /usr/lib/jvm/java-17-openjdk-amd64/bin; do
+        if [ -x "$candidate/java" ]; then
+            ln -sf "$candidate/java" /app/data/jdk/bin/java
             for tool in javac javadoc jar; do
-                ln -sf $(which $tool 2>/dev/null) /app/data/jdk/bin/$tool 2>/dev/null || true
+                [ -x "$candidate/$tool" ] && ln -sf "$candidate/$tool" /app/data/jdk/bin/$tool
+            done
+            JAVA_FOUND=1
+            break
+        fi
+    done
+    
+    if [ $JAVA_FOUND -eq 0 ]; then
+        JAVA_PATH=$(command -v java || true)
+        if [ -n "$JAVA_PATH" ]; then
+            ln -sf "$JAVA_PATH" /app/data/jdk/bin/java
+            for tool in javac javadoc jar; do
+                TOOL_PATH=$(command -v $tool 2>/dev/null || true)
+                [ -n "$TOOL_PATH" ] && ln -sf "$TOOL_PATH" /app/data/jdk/bin/$tool
             done
         else
             echo "ERROR: No Java found on system. Elasticsearch requires Java to run."
@@ -78,15 +91,13 @@ setup_java() {
         fi
     fi
     
-    # Verify Java is available
-    if [ -L /app/data/jdk/bin/java ]; then
-        echo "Java version: $(/app/data/jdk/bin/java -version 2>&1 | head -n 1)"
-    else
+    if [ ! -x /app/data/jdk/bin/java ]; then
         echo "ERROR: Failed to link Java executable"
+        ls -l /app/data/jdk/bin || true
         exit 1
     fi
     
-    # Ensure Java symlinks have correct ownership
+    echo "Java version: $(/app/data/jdk/bin/java -version 2>&1 | head -n 1)"
     chown -R elasticsearch:elasticsearch /app/data/jdk
 }
 
@@ -204,12 +215,14 @@ configure_elasticsearch() {
         chmod 600 $ES_PATH_CONF/{users,users_roles}
     fi
     
-    # Ensure basic settings in elasticsearch.yml
-    for setting in "xpack.security.http.ssl.enabled: false" "network.host: 0.0.0.0" "discovery.type: single-node"; do
-        if ! grep -q "$setting" $ES_PATH_CONF/elasticsearch.yml; then
-            echo "$setting" >> $ES_PATH_CONF/elasticsearch.yml
-        fi
-    done
+    ensure_directory_structure
+    clean_legacy_settings
+    ensure_setting "xpack.security.http.ssl.enabled" "false"
+    ensure_setting "network.host" "0.0.0.0"
+    ensure_setting "discovery.type" "single-node"
+    ensure_setting "path.data" "/app/data/elasticsearch/data"
+    ensure_setting "path.logs" "/app/data/logs"
+    ensure_setting "path.plugins" "/app/data/elasticsearch/plugins"
     
     # Final permission check
     echo "Final permission check on all data directories..."
@@ -360,6 +373,60 @@ setup_keystore() {
     return 0
 }
 
+# Ensure writable dirs exist
+ensure_directory_structure() {
+    mkdir -p /app/data/elasticsearch/{data,plugins}
+    mkdir -p /app/data/logs
+    chown -R elasticsearch:elasticsearch /app/data/elasticsearch
+}
+
+clean_legacy_settings() {
+    sed -i '/^path\.home:/d' "$ES_PATH_CONF/elasticsearch.yml"
+}
+
+ensure_setting() {
+    local key="$1"
+    local value="$2"
+    if grep -q "^$key:" "$ES_PATH_CONF/elasticsearch.yml"; then
+        sed -i "s|^$key:.*|$key: $value|" "$ES_PATH_CONF/elasticsearch.yml"
+    else
+        echo "$key: $value" >> "$ES_PATH_CONF/elasticsearch.yml"
+    fi
+}
+
+# Install optional Elasticsearch plugins (analysis-icu required for multi-language indexing)
+install_plugins() {
+    local plugin_list="${ES_PLUGINS_INSTALL:-analysis-icu}"
+    local plugin_dir="/app/data/elasticsearch/plugins"
+
+    if [ -z "$plugin_list" ]; then
+        echo "No Elasticsearch plugins requested for installation."
+        return 0
+    fi
+
+    # Normalize separators (commas/semicolons/newlines) to whitespace
+    plugin_list=$(echo "$plugin_list" | tr ',;' '  ')
+
+    for plugin in $plugin_list; do
+        plugin=$(echo "$plugin" | xargs)
+        [ -z "$plugin" ] && continue
+
+        if [ -d "$plugin_dir/$plugin" ]; then
+            echo "Plugin '$plugin' already installed. Skipping."
+            continue
+        fi
+
+        echo "Installing Elasticsearch plugin '$plugin'..."
+        if ! su -c "ES_PATH_CONF=$ES_PATH_CONF ES_JAVA_HOME=/app/data/jdk ES_TMPDIR=/tmp $ES_HOME/bin/elasticsearch-plugin install --batch $plugin" elasticsearch; then
+            echo "ERROR: Failed to install plugin '$plugin'."
+            return 1
+        fi
+    done
+
+    echo "✅ Requested Elasticsearch plugins installed."
+    return 0
+}
+
 # Configure JVM heap size
 configure_heap() {
     # Calculate optimal heap size (50% of available memory)
@@ -461,7 +528,8 @@ chmod 600 /app/data/secrets/elastic_password
 
 set_system_limits
 configure_heap
+install_plugins
 start_elasticsearch
 
 # Keep container running
-tail -f /app/data/logs/*.log 2>/dev/null || sleep infinity 
+tail -f /app/data/logs/*.log 2>/dev/null || sleep infinity